[Truffle] Regexp#=~ should not try the reverse operation.

jruby · Nov 3, 2014 · b8bdaac · b8bdaac
1 parent f2b0494
commit b8bdaac
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
@@ -63,16 +63,12 @@ public Object match(RubyRegexp regexp, RubyString string) {
     @CoreMethod(names = "=~", required = 1)
     public abstract static class MatchOperatorNode extends CoreMethodNode {
 
-        @Child protected DispatchHeadNode matchNode;
-
         public MatchOperatorNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            matchNode = new DispatchHeadNode(context);
         }
 
         public MatchOperatorNode(MatchOperatorNode prev) {
             super(prev);
-            matchNode = prev.matchNode;
         }
 
         @Specialization
@@ -83,10 +79,14 @@ public Object match(RubyRegexp regexp, RubyString string) {
         }
 
         @Specialization
-        public Object match(VirtualFrame frame, RubyRegexp regexp, RubyBasicObject other) {
+        public Object match(RubyRegexp regexp, RubyBasicObject other) {
             notDesignedForCompilation();
 
-            return matchNode.call(frame, other, "=~", null, regexp);
+            if (other instanceof RubyString) {
+                return match(regexp, (RubyString) other);
+            } else {
+                return getContext().getCoreLibrary().getNilObject();
+            }
         }
 
     }