diff src/share/vm/oops/instanceMirrorKlass.cpp @ 4009:e5928e7dab26

7098528: crash with java -XX:+ExtendedDTraceProbes Reviewed-by: kvn
author never
date Mon, 17 Oct 2011 21:38:29 -0700
parents c7f3d0b4570f
children da91efe96a93
line wrap: on
line diff
--- a/src/share/vm/oops/instanceMirrorKlass.cpp	Mon Oct 17 11:00:41 2011 -0700
+++ b/src/share/vm/oops/instanceMirrorKlass.cpp	Mon Oct 17 21:38:29 2011 -0700
@@ -288,15 +288,7 @@
   // Query before forming handle.
   int size = instance_size(k);
   KlassHandle h_k(THREAD, as_klassOop());
-  instanceOop i;
-
-  if (JavaObjectsInPerm) {
-    i = (instanceOop) CollectedHeap::permanent_obj_allocate(h_k, size, CHECK_NULL);
-  } else {
-    assert(ScavengeRootsInCode > 0, "must be");
-    i = (instanceOop) CollectedHeap::obj_allocate(h_k, size, CHECK_NULL);
-  }
-
+  instanceOop i = (instanceOop) CollectedHeap::Class_obj_allocate(h_k, size, k, CHECK_NULL);
   return i;
 }