[Truffle] Add helper to check if a class is initialized.

jruby · Sep 6, 2016 · f2b8595 · f2b8595
1 parent cbdcd2b
commit f2b8595
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java
@@ -331,12 +331,12 @@ private DynamicObject initializeGeneralWithoutBlock(VirtualFrame frame, DynamicO
             assert RubyGuards.isRubyClass(rubyClass);
             assert RubyGuards.isRubyClass(superclass);
 
-            if (Layouts.CLASS.getSuperclass(rubyClass) != null || rubyClass == coreLibrary().getBasicObjectClass()) {
+            if (isInitialized(rubyClass)) {
                 throw new RaiseException(getContext().getCoreExceptions().typeErrorAlreadyInitializedClass(this));
             }
             if (superClassProvided) {
                 checkInheritable(superclass);
-                if (superclass != coreLibrary().getBasicObjectClass() && Layouts.CLASS.getSuperclass(superclass) == null) {
+                if (!isInitialized(superclass)) {
                     throw new RaiseException(getContext().getCoreExceptions().typeErrorInheritUninitializedClass(this));
                 }
             }
@@ -350,12 +350,12 @@ private DynamicObject initializeGeneralWithoutBlock(VirtualFrame frame, DynamicO
         private DynamicObject initializeGeneralWithBlock(VirtualFrame frame, DynamicObject rubyClass, DynamicObject superclass, DynamicObject block, boolean superClassProvided) {
             assert RubyGuards.isRubyClass(superclass);
 
-            if (Layouts.CLASS.getSuperclass(rubyClass) != null || rubyClass == coreLibrary().getBasicObjectClass()) {
+            if (isInitialized(rubyClass)) {
                 throw new RaiseException(getContext().getCoreExceptions().typeErrorAlreadyInitializedClass(this));
             }
             if (superClassProvided) {
                 checkInheritable(superclass);
-                if (superclass != coreLibrary().getBasicObjectClass() && Layouts.CLASS.getSuperclass(superclass) == null) {
+                if (!isInitialized(superclass)) {
                     throw new RaiseException(getContext().getCoreExceptions().typeErrorInheritUninitializedClass(this));
                 }
             }
@@ -367,6 +367,10 @@ private DynamicObject initializeGeneralWithBlock(VirtualFrame frame, DynamicObje
             return rubyClass;
         }
 
+        private boolean isInitialized(DynamicObject rubyClass) {
+            return Layouts.CLASS.getSuperclass(rubyClass) != null || rubyClass == coreLibrary().getBasicObjectClass();
+        }
+
         // rb_check_inheritable
         private void checkInheritable(DynamicObject superClass) {
             if (!RubyGuards.isRubyClass(superClass)) {