[Truffle] Use a node directly for MatchData @source.

jruby · Feb 17, 2015 · e44268c · eregon · Feb 17, 2015 · chrisseaton
1 parent 3482b59
commit e44268c
Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java
@@ -10,11 +10,14 @@
 package org.jruby.truffle.nodes.core;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+
 import org.joni.exception.ValueException;
 import org.jruby.runtime.Visibility;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyArray;
@@ -262,8 +265,9 @@ public RubyArray valuesAt(RubyMatchData matchData, Object[] args) {
 
     }
 
-    @CoreMethod(names = "__rubinius_source__", visibility = Visibility.PRIVATE)
-    public abstract static class RubiniusSourceNode extends CoreMethodNode {
+    // Not a core method, used to simulate Rubinius @source.
+    @NodeChild(value = "self")
+    public abstract static class RubiniusSourceNode extends RubyNode {
 
         public RubiniusSourceNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
@@ -118,8 +118,6 @@ public void pauseAllThreadsAndExecuteFromNonRubyThread(Consumer<RubyThread> acti
     }
 
     private synchronized void pauseAllThreadsAndExecute(boolean holdsGlobalLock, Consumer<RubyThread> action) {
-        CompilerDirectives.transferToInterpreter();
-
         this.action = action;
 
         /* this is a potential cause for race conditions,

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -1544,13 +1544,9 @@ public RubyNode visitInstVarNode(org.jruby.ast.InstVarNode node) {
 
         if (sourceSection.getSource().getPath().equals("core:/core/rubinius/common/regexp.rb")) {
             if (nameWithoutSigil.equals("@source")) {
-                return new RubyCallNode(context, sourceSection,
-                        "__rubinius_source__",
-                        new SelfNode(context, sourceSection),
-                        null,
-                        false,
-                        true,
-                        false);
+                return MatchDataNodesFactory.RubiniusSourceNodeFactory.create(
+                        context, sourceSection,
+                        new SelfNode(context, sourceSection));
             } else if (nameWithoutSigil.equals("@full")) {
                 return new RubyCallNode(context, sourceSection,
                         "full",