[Truffle] Do not ignore super class mismatch for explicitly declared …

…superclass as Object
jruby · Dec 2, 2016 · edfbe20 · edfbe20
1 parent d94afea
commit edfbe20
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/spec/truffle/tags/language/class_tags.txt b/spec/truffle/tags/language/class_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java
@@ -36,10 +36,12 @@ public class DefineClassNode extends RubyNode {
     @Child CallDispatchHeadNode inheritedNode;
 
     private final ConditionProfile needToDefineProfile = ConditionProfile.createBinaryProfile();
+    private final ConditionProfile noSuperClassSupplied = ConditionProfile.createBinaryProfile();
     private final BranchProfile errorProfile = BranchProfile.create();
 
-    public DefineClassNode(RubyContext context, SourceSection sourceSection, String name,
-                           RubyNode lexicalParent, RubyNode superClass) {
+    public DefineClassNode(
+            RubyContext context, SourceSection sourceSection, String name,
+            RubyNode lexicalParent, RubyNode superClass) {
         super(context, sourceSection);
         this.name = name;
         this.lexicalParentModule = lexicalParent;
@@ -56,12 +58,18 @@ public Object execute(VirtualFrame frame) {
         }
 
         final DynamicObject lexicalParentModule = (DynamicObject) lexicalParentObject;
-        final DynamicObject superClass = executeSuperClass(frame);
+        final DynamicObject suppliedSuperClass = executeSuperClass(frame);
         final RubyConstant constant = lookupForExistingModule(frame, name, lexicalParentModule);
 
         final DynamicObject definedClass;
 
         if (needToDefineProfile.profile(constant == null)) {
+            final DynamicObject superClass;
+            if (noSuperClassSupplied.profile(suppliedSuperClass == null)) {
+                superClass = getContext().getCoreLibrary().getObjectClass();
+            } else {
+                superClass = suppliedSuperClass;
+            }
             definedClass = ClassNodes.createInitializedRubyClass(getContext(), lexicalParentModule, superClass, name);
             callInherited(frame, superClass, definedClass);
         } else {
@@ -74,8 +82,7 @@ public Object execute(VirtualFrame frame) {
 
             final DynamicObject currentSuperClass = ClassNodes.getSuperClass(definedClass);
 
-            if (currentSuperClass != superClass
-                    && superClass != coreLibrary().getObjectClass()) { // bug-compat with MRI https://bugs.ruby-lang.org/issues/12367
+            if (suppliedSuperClass != null && currentSuperClass != suppliedSuperClass) { // bug-compat with MRI https://bugs.ruby-lang.org/issues/12367
                 errorProfile.enter();
                 throw new RaiseException(coreExceptions().superclassMismatch(
                         Layouts.MODULE.getFields(definedClass).getName(), this));
@@ -86,6 +93,9 @@ public Object execute(VirtualFrame frame) {
     }
 
     private DynamicObject executeSuperClass(VirtualFrame frame) {
+        if (superClassNode == null) {
+            return null;
+        }
         final Object superClassObject = superClassNode.execute(frame);
 
         if (!RubyGuards.isRubyClass(superClassObject)) {

diff --git a/truffle/src/main/java/org/jruby/truffle/parser/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/parser/BodyTranslator.java
@@ -1078,13 +1078,7 @@ public RubyNode visitClassNode(ClassParseNode node) {
 
         RubyNode lexicalParent = translateCPath(sourceSection, node.getCPath());
 
-        RubyNode superClass;
-        if (node.getSuperNode() != null) {
-            superClass = node.getSuperNode().accept(this);
-        } else {
-            superClass = new ObjectLiteralNode(context, fullSourceSection, context.getCoreLibrary().getObjectClass());
-        }
-
+        final RubyNode superClass = node.getSuperNode() != null ? node.getSuperNode().accept(this) : null;
         final DefineClassNode defineOrGetClass = new DefineClassNode(context, fullSourceSection, name, lexicalParent, superClass);
 
         final RubyNode ret = openModule(sourceSection, defineOrGetClass, name, node.getBodyNode(), false);