stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8276209: Some call sites doesn't pass the parameter 'size' to SharedRuntime::dtrace_object_alloc(_base)

Browse Source 
Reviewed-by: dholmes, coleenp
This commit is contained in:
Denghui Dong 2021-11-08 14:30:54 +00:00
parent 71c4b19517
commit c815c5cbbb
13 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
View File

@ -1091,7 +1091,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments); StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments);
save_live_registers(sasm); save_live_registers(sasm);
__ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), c_rarg0); __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), c_rarg0);
restore_live_registers(sasm); restore_live_registers(sasm);
} }

2
src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
View File

@ -3563,7 +3563,7 @@ void TemplateTable::_new() {
// Trigger dtrace event for fastpath // Trigger dtrace event for fastpath
__ push(atos); // save the return value __ push(atos); // save the return value
__ call_VM_leaf( __ call_VM_leaf(
CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), r0); CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), r0);
__ pop(atos); // restore the return value __ pop(atos); // restore the return value
} }

2
src/hotspot/cpu/arm/templateTable_arm.cpp
View File

@ -3985,7 +3985,7 @@ void TemplateTable::_new() {
__ cbz(Rtemp, Lcontinue); __ cbz(Rtemp, Lcontinue);
__ push(atos); __ push(atos);
__ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), Robj); __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), Robj);
__ pop(atos); __ pop(atos);
__ bind(Lcontinue); __ bind(Lcontinue);

2
src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
View File

@ -694,7 +694,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
// save_live_registers(sasm); // save_live_registers(sasm);
// //
// __ save_thread(L7_thread_cache); // __ save_thread(L7_thread_cache);
// __ call(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), // __ call(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)),
// relocInfo::runtime_call_type); // relocInfo::runtime_call_type);
// __ delayed()->mov(I0, O0); // __ delayed()->mov(I0, O0);
// __ restore_thread(L7_thread_cache); // __ restore_thread(L7_thread_cache);

2
src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
View File

@ -3803,7 +3803,7 @@ void TemplateTable::_new() {
// Check and trigger dtrace event. // Check and trigger dtrace event.
SkipIfEqualZero::skip_to_label_if_equal_zero(_masm, Rscratch, &DTraceAllocProbes, Ldone); SkipIfEqualZero::skip_to_label_if_equal_zero(_masm, Rscratch, &DTraceAllocProbes, Ldone);
__ push(atos); __ push(atos);
__ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc)); __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)));
__ pop(atos); __ pop(atos);
__ b(Ldone); __ b(Ldone);

2
src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
View File

@ -667,7 +667,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
save_live_registers(sasm, 1); save_live_registers(sasm, 1);
__ NOT_LP64(push(rax)) LP64_ONLY(mov(c_rarg0, rax)); __ NOT_LP64(push(rax)) LP64_ONLY(mov(c_rarg0, rax));
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc))); __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc))));
NOT_LP64(__ pop(rax)); NOT_LP64(__ pop(rax));
restore_live_registers(sasm); restore_live_registers(sasm);

2
src/hotspot/cpu/s390/templateTable_s390.cpp
View File

@ -3822,7 +3822,7 @@ void TemplateTable::_new() {
SkipIfEqual skip(_masm, &DTraceAllocProbes, false, Z_ARG5 /*scratch*/); SkipIfEqual skip(_masm, &DTraceAllocProbes, false, Z_ARG5 /*scratch*/);
// Trigger dtrace event for fastpath. // Trigger dtrace event for fastpath.
__ push(atos); // Save the return value. __ push(atos); // Save the return value.
__ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), RallocatedObject); __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), RallocatedObject);
__ pop(atos); // Restore the return value. __ pop(atos); // Restore the return value.
} }
__ z_bru(done); __ z_bru(done);

2
src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
View File

@ -1497,7 +1497,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
save_live_registers(sasm, 1); save_live_registers(sasm, 1);
__ NOT_LP64(push(rax)) LP64_ONLY(mov(c_rarg0, rax)); __ NOT_LP64(push(rax)) LP64_ONLY(mov(c_rarg0, rax));
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc))); __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc))));
NOT_LP64(__ pop(rax)); NOT_LP64(__ pop(rax));
restore_live_registers(sasm); restore_live_registers(sasm);

2
src/hotspot/cpu/x86/templateTable_x86.cpp
View File

@ -4038,7 +4038,7 @@ void TemplateTable::_new() {
// Trigger dtrace event for fastpath // Trigger dtrace event for fastpath
__ push(atos); __ push(atos);
__ call_VM_leaf( __ call_VM_leaf(
CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), rax); CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), rax);
__ pop(atos); __ pop(atos);
} }

2
src/hotspot/share/gc/shared/memAllocator.cpp
View File

@ -239,7 +239,7 @@ void MemAllocator::Allocation::notify_allocation_dtrace_sampler() {
Klass* klass = obj()->klass(); Klass* klass = obj()->klass();
size_t word_size = _allocator._word_size; size_t word_size = _allocator._word_size;
if (klass != NULL && klass->name() != NULL) { if (klass != NULL && klass->name() != NULL) {
SharedRuntime::dtrace_object_alloc(obj(), (int)word_size); SharedRuntime::dtrace_object_alloc(Thread::current(), obj(), word_size);
} }
} }
} }

3
src/hotspot/share/opto/macro.cpp
View File

@ -1635,7 +1635,8 @@ void PhaseMacroExpand::expand_dtrace_alloc_probe(AllocateNode* alloc, Node* oop,
// Slow-path call // Slow-path call
int size = TypeFunc::Parms + 2; int size = TypeFunc::Parms + 2;
CallLeafNode *call = new CallLeafNode(OptoRuntime::dtrace_object_alloc_Type(), CallLeafNode *call = new CallLeafNode(OptoRuntime::dtrace_object_alloc_Type(),
CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc_base), CAST_FROM_FN_PTR(address,
static_cast<int (*)(Thread*, oopDesc*)>(SharedRuntime::dtrace_object_alloc)),
"dtrace_object_alloc", "dtrace_object_alloc",
TypeRawPtr::BOTTOM); TypeRawPtr::BOTTOM);

10
src/hotspot/share/runtime/sharedRuntime.cpp
View File

@ -1001,11 +1001,15 @@ jlong SharedRuntime::get_java_tid(Thread* thread) {
* it gets turned into a tail-call on sparc, which runs into dtrace bug * it gets turned into a tail-call on sparc, which runs into dtrace bug
* 6254741. Once that is fixed we can remove the dummy return value. * 6254741. Once that is fixed we can remove the dummy return value.
*/ */
int SharedRuntime::dtrace_object_alloc(oopDesc* o, int size) { int SharedRuntime::dtrace_object_alloc(oopDesc* o) {
return dtrace_object_alloc_base(Thread::current(), o, size); return dtrace_object_alloc(Thread::current(), o, o->size());
} }
int SharedRuntime::dtrace_object_alloc_base(Thread* thread, oopDesc* o, int size) { int SharedRuntime::dtrace_object_alloc(Thread* thread, oopDesc* o) {
return dtrace_object_alloc(thread, o, o->size());
}
int SharedRuntime::dtrace_object_alloc(Thread* thread, oopDesc* o, size_t size) {
assert(DTraceAllocProbes, "wrong call"); assert(DTraceAllocProbes, "wrong call");
Klass* klass = o->klass(); Klass* klass = o->klass();
Symbol* name = klass->name(); Symbol* name = klass->name();

5
src/hotspot/share/runtime/sharedRuntime.hpp
View File

@ -271,8 +271,9 @@ class SharedRuntime: AllStatic {
static void register_finalizer(JavaThread* thread, oopDesc* obj); static void register_finalizer(JavaThread* thread, oopDesc* obj);
// dtrace notifications // dtrace notifications
static int dtrace_object_alloc(oopDesc* o, int size); static int dtrace_object_alloc(oopDesc* o);
static int dtrace_object_alloc_base(Thread* thread, oopDesc* o, int size); static int dtrace_object_alloc(Thread* thread, oopDesc* o);
static int dtrace_object_alloc(Thread* thread, oopDesc* o, size_t size);
static int dtrace_method_entry(JavaThread* thread, Method* m); static int dtrace_method_entry(JavaThread* thread, Method* m);
static int dtrace_method_exit(JavaThread* thread, Method* m); static int dtrace_method_exit(JavaThread* thread, Method* m);