[Truffle] Singleton class definitions don't get a new return ID.

jruby · Jan 6, 2016 · 2f25127 · 2f25127
1 parent 71ae5d4
commit 2f25127
Showing 2 changed files with 9 additions and 2 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/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -802,8 +802,16 @@ private RubyNode openModule(SourceSection sourceSection, RubyNode defineOrGetNod
         try {
             final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(sourceSection, newLexicalScope, Arity.NO_ARGUMENTS, name, false, null, false, false, false);
 
+            final ReturnID returnId;
+
+            if (sclass) {
+                returnId = environment.getReturnID();
+            } else {
+                returnId = environment.getParseEnvironment().allocateReturnID();
+            }
+
             final TranslatorEnvironment newEnvironment = new TranslatorEnvironment(context, environment, environment.getParseEnvironment(),
-                    environment.getParseEnvironment().allocateReturnID(), true, true, sharedMethodInfo, name, false, null);
+                    returnId, true, true, sharedMethodInfo, name, false, null);
 
             final BodyTranslator moduleTranslator = new BodyTranslator(currentNode, context, this, newEnvironment, source, false);