* java/lang/VMClassLoader.java (getPrimitiveClass): Now native. Now

	takes a jchar type-code argument, not a string.
	* java/lang/natClassLoader.cc (VMClassLoader::getPrimitiveClass):
	New method. Just call _Jv_FindClassFromSignature.
	* java/lang/Boolean.java (TYPE): Initialize from
	VMClassLoader.getPrimitiveClass using type-code.
	* java/lang/Character.java (TYPE): Likewise.
	* java/lang/Double.java (TYPE): Likewise.
	* java/lang/Float.java (TYPE): Likewise.
	* java/lang/Integer.java (TYPE): Likewise.
	* java/lang/Long.java (TYPE): Likewise.
	* java/lang/Short.java (TYPE): Likewise.
	* java/lang/Void.java (TYPE): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46521 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 26 deletions

diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
index dcfec0558f3..5ff7ae86b21 100644
--- a/libjava/java/lang/VMClassLoader.java
+++ b/libjava/java/lang/VMClassLoader.java
@@ -54,32 +54,9 @@ class VMClassLoader {
 
     /** 
      * Helper for java.lang.Integer, Byte, etc. to get the TYPE class
-     * at initialization time.  If there are multiple classloaders, this
-     * method may be called once per ClassLoader per type.
+     * at initialization time. 
      *
-     * @param type name of the primitive type; i.e. "int", "byte", etc.
-     * @return a "bogus" class representing the primitive type.
+     * @param type code for the primitive type.
      */
-  static final Class getPrimitiveClass(String type)
-  {
-    if ("int".equals (type))
-      return int.class;
-    else if ("long".equals (type))
-      return long.class;
-    else if ("boolean".equals (type))
-      return boolean.class;
-    else if ("short".equals (type))
-      return short.class;
-    else if ("char".equals (type))
-      return char.class;
-    else if ("byte".equals (type))
-      return byte.class;
-    else if ("float".equals (type))
-      return float.class;
-    else if ("double".equals (type))
-      return double.class;
-    else if ("void".equals (type))
-      return void.class;
-    return null;
-  }
+  static native Class getPrimitiveClass(char type);
 }