Delays LocalJumpError and SystemExit clas creations. But failed to de…

…lay NameError class creation. If it's delayed runtime.getClass(NameError) returns null. This could be fixed changing the place to call tryGetConstantIfPossible. But, it ended up in classloader related(?) trouble to find org.jruby.runtime.backtrace.FrameType.
jruby · Jul 20, 2012 · cff6994 · cff6994
1 parent a07f7ea
commit cff6994
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/src/org/jruby/NativeException.java b/src/org/jruby/NativeException.java
@@ -66,7 +66,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
         }
     };
 
-    public static RubyClass createClass(Ruby runtime, RubyClass baseClass) {
+    static RubyClass createClass(Ruby runtime, RubyClass baseClass) {
         RubyClass exceptionClass = runtime.defineClass(CLASS_NAME, baseClass, NATIVE_EXCEPTION_ALLOCATOR);
 
         exceptionClass.defineAnnotatedMethods(NativeException.class);

diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1389,7 +1389,13 @@ private void initClassCreatorMap() {
             classCreatorMap.put("ScriptError", this.getClass().getMethod("getScriptError"));
             classCreatorMap.put("RangeError", this.getClass().getMethod("getRangeError"));
             classCreatorMap.put("SignalException", this.getClass().getMethod("getSignalException"));
+            classCreatorMap.put("NameError", this.getClass().getMethod("getNameError"));
+            classCreatorMap.put("NameError::Message", this.getClass().getMethod("getNameErrorMessage"));
+            classCreatorMap.put("SystemExit", this.getClass().getMethod("getSystemExit"));
+
             classCreatorMap.put("NoMethodError", this.getClass().getMethod("getNoMethodError"));
+            classCreatorMap.put("LocalJumpError", this.getClass().getMethod("getLocalJumpError"));
+            classCreatorMap.put("NativeException", this.getClass().getMethod("getNativeException"));
             classCreatorMap.put("SystemCallError", this.getClass().getMethod("getSystemCallError"));
             classCreatorMap.put("Fatal", this.getClass().getMethod("getFatal"));
             classCreatorMap.put("Interrupt", this.getClass().getMethod("getInterrupt"));
@@ -1424,21 +1430,8 @@ public Method findClassCreatorMethod(String name) {
 
     private void initExceptions() {
         initClassCreatorMap();
-
-        if (profile.allowClass("NameError")) {
-            nameError = RubyNameError.createNameErrorClass(this, getStandardError());
-            nameErrorMessage = RubyNameError.createNameErrorMessageClass(this, nameError);            
-        }
-        if (profile.allowClass("SystemExit")) {
-            systemExit = RubySystemExit.createSystemExitClass(this, getException());
-        }
-        if (profile.allowClass("LocalJumpError")) {
-            localJumpError = RubyLocalJumpError.createLocalJumpErrorClass(this, getStandardError());
-        }
-        if (profile.allowClass("NativeException")) {
-            nativeException = NativeException.createClass(this, getRuntimeError());
-        }
-
+        nameError = getNameError();
+
         if (is1_9()) {
             if (profile.allowClass("EncodingError")) {
                 encodingError = defineClass("EncodingError", getStandardError(), getStandardError().getAllocator());
@@ -2144,10 +2137,16 @@ public RubyClass getException() {
     }
 
     public RubyClass getNameError() {
+        if (nameError == null && profile.allowClass("NameError")) {
+            nameError = RubyNameError.createNameErrorClass(this, getStandardError());           
+        }
         return nameError;
     }
 
     public RubyClass getNameErrorMessage() {
+        if (nameErrorMessage == null && profile.allowClass("NameError")) {
+            nameErrorMessage = RubyNameError.createNameErrorMessageClass(this, getNameError());            
+        }
         return nameErrorMessage;
     }
 
@@ -2169,14 +2168,23 @@ public RubyClass getRangeError() {
     }
 
     public RubyClass getSystemExit() {
+        if (systemExit == null && profile.allowClass("SystemExit")) {
+            systemExit = RubySystemExit.createSystemExitClass(this, getException());
+        }
         return systemExit;
     }
 
     public RubyClass getLocalJumpError() {
+        if (localJumpError == null && profile.allowClass("LocalJumpError")) {
+            localJumpError = RubyLocalJumpError.createLocalJumpErrorClass(this, getStandardError());
+        }
         return localJumpError;
     }
 
     public RubyClass getNativeException() {
+        if (nativeException == null && profile.allowClass("NativeException")) {
+            nativeException = NativeException.createClass(this, getRuntimeError());
+        }
         return nativeException;
     }
 

diff --git a/src/org/jruby/RubyLocalJumpError.java b/src/org/jruby/RubyLocalJumpError.java
@@ -50,7 +50,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
         }
     };
 
-    public static RubyClass createLocalJumpErrorClass(Ruby runtime, RubyClass standardErrorClass) {
+    static RubyClass createLocalJumpErrorClass(Ruby runtime, RubyClass standardErrorClass) {
         RubyClass nameErrorClass = runtime.defineClass("LocalJumpError", standardErrorClass, LOCALJUMPERROR_ALLOCATOR);
 
         nameErrorClass.defineAnnotatedMethods(RubyLocalJumpError.class);

diff --git a/src/org/jruby/RubyModule.java b/src/org/jruby/RubyModule.java
@@ -3465,7 +3465,7 @@ public IRubyObject fetchConstant(String name) {
     public IRubyObject fetchConstant(String name, boolean includePrivate) {
         assert IdUtil.isConstant(name);
         ConstantEntry entry = constantEntryFetch(name);
-
+ 
         if (entry == null) return null;
 
         if (entry.hidden && !includePrivate) {

diff --git a/src/org/jruby/RubyNameError.java b/src/org/jruby/RubyNameError.java
@@ -141,13 +141,13 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
         }
     };
 
-    public static RubyClass createNameErrorClass(Ruby runtime, RubyClass standardErrorClass) {
+    static RubyClass createNameErrorClass(Ruby runtime, RubyClass standardErrorClass) {
         RubyClass nameErrorClass = runtime.defineClass("NameError", standardErrorClass, NAMEERROR_ALLOCATOR);
         nameErrorClass.defineAnnotatedMethods(RubyNameError.class);
         return nameErrorClass;
     }
 
-    public static RubyClass createNameErrorMessageClass(Ruby runtime, RubyClass nameErrorClass) {
+    static RubyClass createNameErrorMessageClass(Ruby runtime, RubyClass nameErrorClass) {
         RubyClass messageClass = nameErrorClass.defineClassUnder("Message", runtime.getClass("Data"), RubyNameErrorMessage.NAMEERRORMESSAGE_ALLOCATOR);
         messageClass.defineAnnotatedMethods(RubyNameErrorMessage.class);
         return messageClass;

diff --git a/src/org/jruby/RubySystemExit.java b/src/org/jruby/RubySystemExit.java
@@ -43,7 +43,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
         }
     };    
 
-    public static RubyClass createSystemExitClass(Ruby runtime, RubyClass exceptionClass) {
+    static RubyClass createSystemExitClass(Ruby runtime, RubyClass exceptionClass) {
         RubyClass systemExitClass = runtime.defineClass("SystemExit", exceptionClass, SYSTEMEXIT_ALLOCATOR);
 
         systemExitClass.defineAnnotatedMethods(RubySystemExit.class);