src/share/vm/runtime/sharedRuntime.cpp

changeset 6627
cf9f24de0b93
parent 6503
a9becfeecd1b
child 6658
e0a77b91da68
     1.1 --- a/src/share/vm/runtime/sharedRuntime.cpp	Tue Apr 15 17:02:20 2014 -0400
     1.2 +++ b/src/share/vm/runtime/sharedRuntime.cpp	Fri Apr 11 20:02:37 2014 +0000
     1.3 @@ -960,14 +960,13 @@
     1.4   * it gets turned into a tail-call on sparc, which runs into dtrace bug
     1.5   * 6254741.  Once that is fixed we can remove the dummy return value.
     1.6   */
     1.7 -int SharedRuntime::dtrace_object_alloc(oopDesc* o) {
     1.8 -  return dtrace_object_alloc_base(Thread::current(), o);
     1.9 +int SharedRuntime::dtrace_object_alloc(oopDesc* o, int size) {
    1.10 +  return dtrace_object_alloc_base(Thread::current(), o, size);
    1.11  }
    1.12  
    1.13 -int SharedRuntime::dtrace_object_alloc_base(Thread* thread, oopDesc* o) {
    1.14 +int SharedRuntime::dtrace_object_alloc_base(Thread* thread, oopDesc* o, int size) {
    1.15    assert(DTraceAllocProbes, "wrong call");
    1.16    Klass* klass = o->klass();
    1.17 -  int size = o->size();
    1.18    Symbol* name = klass->name();
    1.19  #ifndef USDT2
    1.20    HS_DTRACE_PROBE4(hotspot, object__alloc, get_java_tid(thread),

mercurial