Mercurial > hg > truffle

diff src/share/vm/runtime/sharedRuntime.hpp @ 17891:b6a2ba7d3ea7 hs25.20-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents cf9f24de0b93
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.hpp	Wed Apr 16 12:32:23 2014 -0700
+++ b/src/share/vm/runtime/sharedRuntime.hpp	Thu Apr 17 16:09:07 2014 -0700
@@ -261,8 +261,8 @@
   static void register_finalizer(JavaThread* thread, oopDesc* obj);
 
   // dtrace notifications
-  static int dtrace_object_alloc(oopDesc* o);
-  static int dtrace_object_alloc_base(Thread* thread, oopDesc* o);
+  static int dtrace_object_alloc(oopDesc* o, int size);
+  static int dtrace_object_alloc_base(Thread* thread, oopDesc* o, int size);
   static int dtrace_method_entry(JavaThread* thread, Method* m);
   static int dtrace_method_exit(JavaThread* thread, Method* m);