[GR-15990] Remove some context fields

PullRequest: truffleruby/2406

Author: eregon

src/main/java/org/truffleruby/language/control/WhileNode.java

@@ -47,7 +47,7 @@ private static abstract class WhileRepeatingBaseNode extends RubyContextNode imp
         protected final BranchProfile redoUsed = BranchProfile.create();
         protected final BranchProfile nextUsed = BranchProfile.create();
 
-        public WhileRepeatingBaseNode(RubyContext context, RubyNode condition, RubyNode body) {
+        public WhileRepeatingBaseNode(RubyNode condition, RubyNode body) {
             this.condition = BooleanCastNodeGen.create(condition);
             this.body = body;
         }
@@ -61,8 +61,8 @@ public String toString() {
 
     public static class WhileRepeatingNode extends WhileRepeatingBaseNode implements RepeatingNode {
 
-        public WhileRepeatingNode(RubyContext context, RubyNode condition, RubyNode body) {
-            super(context, condition, body);
+        public WhileRepeatingNode(RubyNode condition, RubyNode body) {
+            super(condition, body);
         }
 
         @Override
@@ -90,8 +90,8 @@ public boolean executeRepeating(VirtualFrame frame) {
 
     public static class DoWhileRepeatingNode extends WhileRepeatingBaseNode implements RepeatingNode {
 
-        public DoWhileRepeatingNode(RubyContext context, RubyNode condition, RubyNode body) {
-            super(context, condition, body);
+        public DoWhileRepeatingNode(RubyNode condition, RubyNode body) {
+            super(condition, body);
         }
 
         @Override

src/main/java/org/truffleruby/language/methods/LookupMethodNode.java

@@ -23,7 +23,6 @@
 import org.truffleruby.language.objects.MetaClassNode;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -45,24 +44,20 @@ public abstract InternalMethod execute(Frame frame, RubyClass metaClass, String
             DispatchConfiguration config);
 
     @Specialization(
-            guards = {
-                    "metaClass == cachedMetaClass",
-                    "name == cachedName",
-                    "config == cachedConfig",
-                    "contextReference.get() == cachedContext" },
+            // no need to guard on the context, the metaClass is context-specific
+            guards = { "metaClass == cachedMetaClass", "name == cachedName", "config == cachedConfig" },
             assumptions = "methodLookupResult.getAssumptions()",
             limit = "getCacheLimit()")
     protected InternalMethod lookupMethodCached(
             Frame frame,
             RubyClass metaClass,
             String name,
             DispatchConfiguration config,
-            @CachedContext(RubyLanguage.class) TruffleLanguage.ContextReference<RubyContext> contextReference,
-            @Cached("contextReference.get()") RubyContext cachedContext,
+            @CachedContext(RubyLanguage.class) RubyContext context,
             @Cached("metaClass") RubyClass cachedMetaClass,
             @Cached("name") String cachedName,
             @Cached("config") DispatchConfiguration cachedConfig,
-            @Cached("lookupCached(cachedContext, frame, cachedMetaClass, cachedName, config)") MethodLookupResult methodLookupResult) {
+            @Cached("lookupCached(context, frame, cachedMetaClass, cachedName, config)") MethodLookupResult methodLookupResult) {
 
         return methodLookupResult.getMethod();
     }
@@ -76,7 +71,6 @@ protected InternalMethod lookupMethodUncached(
             @CachedContext(RubyLanguage.class) RubyContext context,
             @Cached MetaClassNode metaClassNode,
             @Cached ConditionProfile noCallerMethodProfile,
-            @Cached ConditionProfile isSendProfile,
             @Cached ConditionProfile foreignProfile,
             @Cached ConditionProfile noPrependedModulesProfile,
             @Cached ConditionProfile onMetaClassProfile,

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -3258,9 +3258,9 @@ private RubyNode translateWhileNode(WhileParseNode node, boolean conditionInvers
         final RubyNode loop;
 
         if (node.evaluateAtStart()) {
-            loop = new WhileNode(new WhileNode.WhileRepeatingNode(context, condition, body));
+            loop = new WhileNode(new WhileNode.WhileRepeatingNode(condition, body));
         } else {
-            loop = new WhileNode(new WhileNode.DoWhileRepeatingNode(context, condition, body));
+            loop = new WhileNode(new WhileNode.DoWhileRepeatingNode(condition, body));
         }
 
         final RubyNode ret = new CatchBreakNode(whileBreakID, loop, true);

src/main/java/org/truffleruby/parser/TranslatorDriver.java

@@ -316,7 +316,7 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
                         sourceIndexLength,
                         Arrays.asList(new ChompLoopNode(), truffleNode));
             }
-            truffleNode = new WhileNode(new WhileNode.WhileRepeatingNode(context, new KernelGetsNode(), truffleNode));
+            truffleNode = new WhileNode(new WhileNode.WhileRepeatingNode(new KernelGetsNode(), truffleNode));
         }
 
         if (beginNode != null) {