Cleanups

Author: eregon

src/main/java/org/truffleruby/language/dispatch/DispatchMethodMissingNode.java

@@ -14,6 +14,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.Node;
@@ -22,7 +23,6 @@
 import org.truffleruby.core.exception.ExceptionOperations;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.methods.CallForeignMethodNode;
@@ -31,14 +31,15 @@
 
 @GenerateInline(false)
 @GenerateUncached
+@ImportStatic(MissingBehavior.class)
 public abstract class DispatchMethodMissingNode extends RubyBaseNode {
 
 
     public abstract Object execute(Frame frame, Object receiver, String methodName, Object[] rubyArgs,
             DispatchConfiguration config, LiteralCallNode literalCallNode);
 
 
-    @Specialization(guards = "isReturnMissing(config)")
+    @Specialization(guards = "config.missingBehavior == RETURN_MISSING")
     protected static Object dispatchReturnMissing(
             Frame frame,
             Object receiver,
@@ -50,7 +51,7 @@ protected static Object dispatchReturnMissing(
     }
 
     @InliningCutoff
-    @Specialization(guards = "isForeignObject(config, receiver)")
+    @Specialization(guards = { "config.missingBehavior == CALL_METHOD_MISSING", "isForeignObject(receiver)" })
     protected static Object dispatchForeign(
             Frame frame,
             Object receiver,
@@ -65,7 +66,7 @@ protected static Object dispatchForeign(
     }
 
     @InliningCutoff
-    @Specialization(guards = "isMethodMissing(config, receiver)")
+    @Specialization(guards = { "config.missingBehavior == CALL_METHOD_MISSING", "!isForeignObject(receiver)" })
     protected static Object dispatchMissingMethod(
             Frame frame,
             Object receiver,
@@ -97,16 +98,4 @@ protected static Object dispatchMissingMethod(
 
         return result;
     }
-
-    protected static boolean isReturnMissing(DispatchConfiguration config) {
-        return config.missingBehavior == MissingBehavior.RETURN_MISSING;
-    }
-
-    protected static boolean isForeignObject(DispatchConfiguration config, Object receiver) {
-        return config.missingBehavior == MissingBehavior.CALL_METHOD_MISSING && RubyGuards.isForeignObject(receiver);
-    }
-
-    protected static boolean isMethodMissing(DispatchConfiguration config, Object receiver) {
-        return config.missingBehavior == MissingBehavior.CALL_METHOD_MISSING && !RubyGuards.isForeignObject(receiver);
-    }
 }

src/main/java/org/truffleruby/language/dispatch/DispatchNode.java

@@ -10,6 +10,7 @@
 package org.truffleruby.language.dispatch;
 
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -303,6 +304,7 @@ protected final Object dispatchInternal(Frame frame, Object receiver, String met
             Assumption specialVariableAssumption,
             LazyDispatchMethodMissingNode lazyDispatchMethodMissingNode) {
         assert RubyArguments.getSelf(rubyArgs) == receiver;
+        CompilerAsserts.partialEvaluationConstant(config);
 
         final RubyClass metaclass = metaClassNode.execute(this, receiver);
         final InternalMethod method = lookupMethodNode.execute(frame, metaclass, methodName, config);