8223623: Move oopFactory function definitions out of oopFactory.hpp
authorstefank
Thu, 09 May 2019 14:26:52 +0200
changeset 54785 83b3671d9e30
parent 54784 31b27600b5db
child 54786 ebf733a324d4
8223623: Move oopFactory function definitions out of oopFactory.hpp Reviewed-by: coleenp, lkorinth
src/hotspot/share/memory/oopFactory.cpp
src/hotspot/share/memory/oopFactory.hpp
--- a/src/hotspot/share/memory/oopFactory.cpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/memory/oopFactory.cpp	Thu May 09 14:26:52 2019 +0200
@@ -33,12 +33,51 @@
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceOop.hpp"
+#include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/typeArrayKlass.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "utilities/utf8.hpp"
 
+typeArrayOop oopFactory::new_boolArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::boolArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_charArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::charArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_floatArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::floatArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_doubleArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::doubleArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_byteArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::byteArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_shortArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::shortArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_intArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::intArrayKlassObj())->allocate(length, THREAD);
+}
+
+typeArrayOop oopFactory::new_longArray(int length, TRAPS) {
+  return TypeArrayKlass::cast(Universe::longArrayKlassObj())->allocate(length, THREAD);
+}
+
+// create java.lang.Object[]
+objArrayOop oopFactory::new_objectArray(int length, TRAPS)  {
+  assert(Universe::objectArrayKlassObj() != NULL, "Too early?");
+  return ObjArrayKlass::cast(Universe::objectArrayKlassObj())->allocate(length, THREAD);
+}
 
 typeArrayOop oopFactory::new_charArray(const char* utf8_str, TRAPS) {
   int length = utf8_str == NULL ? 0 : UTF8::unicode_length(utf8_str);
--- a/src/hotspot/share/memory/oopFactory.hpp	Thu May 09 14:26:03 2019 +0200
+++ b/src/hotspot/share/memory/oopFactory.hpp	Thu May 09 14:26:52 2019 +0200
@@ -41,23 +41,19 @@
 class oopFactory: AllStatic {
  public:
   // Basic type leaf array allocation
-  static typeArrayOop    new_boolArray  (int length, TRAPS) { return TypeArrayKlass::cast(Universe::boolArrayKlassObj  ())->allocate(length, THREAD); }
-  static typeArrayOop    new_charArray  (int length, TRAPS) { return TypeArrayKlass::cast(Universe::charArrayKlassObj  ())->allocate(length, THREAD); }
-  static typeArrayOop    new_floatArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::floatArrayKlassObj())->allocate(length, THREAD); }
-  static typeArrayOop    new_doubleArray(int length, TRAPS) { return TypeArrayKlass::cast(Universe::doubleArrayKlassObj())->allocate(length, THREAD); }
-  static typeArrayOop    new_byteArray  (int length, TRAPS) { return TypeArrayKlass::cast(Universe::byteArrayKlassObj  ())->allocate(length, THREAD); }
-  static typeArrayOop    new_shortArray (int length, TRAPS) { return TypeArrayKlass::cast(Universe::shortArrayKlassObj ())->allocate(length, THREAD); }
-  static typeArrayOop    new_intArray   (int length, TRAPS) { return TypeArrayKlass::cast(Universe::intArrayKlassObj   ())->allocate(length, THREAD); }
-  static typeArrayOop    new_longArray  (int length, TRAPS) { return TypeArrayKlass::cast(Universe::longArrayKlassObj  ())->allocate(length, THREAD); }
+  static typeArrayOop    new_boolArray  (int length, TRAPS);
+  static typeArrayOop    new_charArray  (int length, TRAPS);
+  static typeArrayOop    new_floatArray (int length, TRAPS);
+  static typeArrayOop    new_doubleArray(int length, TRAPS);
+  static typeArrayOop    new_byteArray  (int length, TRAPS);
+  static typeArrayOop    new_shortArray (int length, TRAPS);
+  static typeArrayOop    new_intArray   (int length, TRAPS);
+  static typeArrayOop    new_longArray  (int length, TRAPS);
 
   // create java.lang.Object[]
-  static objArrayOop     new_objectArray(int length, TRAPS)  {
-    assert(Universe::objectArrayKlassObj() != NULL, "Too early?");
-    return ObjArrayKlass::
-      cast(Universe::objectArrayKlassObj())->allocate(length, THREAD);
-  }
+  static objArrayOop     new_objectArray(int length, TRAPS);
 
-  static typeArrayOop    new_charArray           (const char* utf8_str,  TRAPS);
+  static typeArrayOop    new_charArray(const char* utf8_str,  TRAPS);
   static typeArrayOop    new_tenured_charArray(int length, TRAPS);
 
   static typeArrayOop    new_typeArray(BasicType type, int length, TRAPS);