From 846af5777244f451ef8605db5da25d36672f4acc Mon Sep 17 00:00:00 2001
From: stefank <unknown>
Date: Mon, 21 Feb 2011 11:26:45 +0100
Subject: [PATCH] 7020992: jmm_DumpThreads should not allocate system object
 arrays outside the perm gen Summary: Allocate ordinary object arrays
 Reviewed-by: ysr, never, mchung

---
 src/share/vm/memory/oopFactory.cpp   | 15 +++------------
 src/share/vm/memory/oopFactory.hpp   |  1 -
 src/share/vm/services/management.cpp |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/share/vm/memory/oopFactory.cpp b/src/share/vm/memory/oopFactory.cpp
index 7ef11b15f..c8b45b68a 100644
--- a/src/share/vm/memory/oopFactory.cpp
+++ b/src/share/vm/memory/oopFactory.cpp
@@ -92,21 +92,12 @@ objArrayOop oopFactory::new_objArray(klassOop klass, int length, TRAPS) {
   }
 }
 
-objArrayOop oopFactory::new_system_objArray(int length, bool in_perm_gen, TRAPS) {
+objArrayOop oopFactory::new_system_objArray(int length, TRAPS) {
   int size = objArrayOopDesc::object_size(length);
   KlassHandle klass (THREAD, Universe::systemObjArrayKlassObj());
-  oop o;
-  if (in_perm_gen) {
-    o = Universe::heap()->permanent_array_allocate(klass, size, length, CHECK_NULL);
-  } else {
-    o = Universe::heap()->array_allocate(klass, size, length, CHECK_NULL);
-  }
+  objArrayOop o = (objArrayOop)
+    Universe::heap()->permanent_array_allocate(klass, size, length, CHECK_NULL);
   // initialization not needed, allocated cleared
-  return (objArrayOop) o;
-}
-
-objArrayOop oopFactory::new_system_objArray(int length, TRAPS) {
-  objArrayOop o = oopFactory::new_system_objArray(length, true, CHECK_NULL);
   return o;
 }
 
diff --git a/src/share/vm/memory/oopFactory.hpp b/src/share/vm/memory/oopFactory.hpp
index a2b34de8c..49b89bc3b 100644
--- a/src/share/vm/memory/oopFactory.hpp
+++ b/src/share/vm/memory/oopFactory.hpp
@@ -102,7 +102,6 @@ public:
 
   // System object arrays
   static objArrayOop     new_system_objArray(int length, TRAPS);
-  static objArrayOop     new_system_objArray(int length, bool in_perm_gen, TRAPS);
 
   // Regular object arrays
   static objArrayOop     new_objArray(klassOop klass, int length, TRAPS);
diff --git a/src/share/vm/services/management.cpp b/src/share/vm/services/management.cpp
index fb2bda707..3c4f1481c 100644
--- a/src/share/vm/services/management.cpp
+++ b/src/share/vm/services/management.cpp
@@ -1311,7 +1311,7 @@ JVM_ENTRY(jobjectArray, jmm_DumpThreads(JNIEnv *env, jlongArray thread_ids, jboo
     if (locked_monitors) {
       // Constructs Object[] and int[] to contain the object monitor and the stack depth
       // where the thread locked it
-      objArrayOop array = oopFactory::new_system_objArray(num_locked_monitors, false, CHECK_NULL);
+      objArrayOop array = oopFactory::new_objArray(SystemDictionary::Object_klass(), num_locked_monitors, CHECK_NULL);
       objArrayHandle mh(THREAD, array);
       monitors_array = mh;
 
@@ -1353,7 +1353,7 @@ JVM_ENTRY(jobjectArray, jmm_DumpThreads(JNIEnv *env, jlongArray thread_ids, jboo
       GrowableArray<instanceOop>* locks = (tcl != NULL ? tcl->owned_locks() : NULL);
       int num_locked_synchronizers = (locks != NULL ? locks->length() : 0);
 
-      objArrayOop array = oopFactory::new_system_objArray(num_locked_synchronizers, false, CHECK_NULL);
+      objArrayOop array = oopFactory::new_objArray(SystemDictionary::Object_klass(), num_locked_synchronizers, CHECK_NULL);
       objArrayHandle sh(THREAD, array);
       synchronizers_array = sh;
 
-- 
GitLab