[Truffle] Remove some notDesignedForCompilations.

jruby · May 6, 2015 · b1185e0 · b1185e0
1 parent 3827161
commit b1185e0
Showing 7 changed files with 10 additions and 20 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.methods;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -39,7 +40,7 @@ public AddMethodNode(RubyContext context, SourceSection section, RubyNode receiv
 
     @Override
     public RubySymbol execute(VirtualFrame frame) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         final Object receiverObject = receiver.execute(frame);
 
@@ -67,8 +68,6 @@ public RubySymbol execute(VirtualFrame frame) {
     }
 
     private static Visibility getVisibility(Frame frame, String name) {
-        notDesignedForCompilation();
-
         if (ModuleOperations.isMethodPrivateFromName(name)) {
             return Visibility.PRIVATE;
         } else {
@@ -77,8 +76,6 @@ private static Visibility getVisibility(Frame frame, String name) {
     }
 
     private static Visibility getVisibility(Frame frame) {
-        notDesignedForCompilation();
-
         while (frame != null) {
             Visibility visibility = findVisibility(frame);
             if (visibility != null) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/AliasNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/AliasNode.java
@@ -65,15 +65,15 @@ public Object alias(RubyBignum value) {
 
     @Specialization
     public Object alias(RubyModule module) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         module.alias(this, newName, oldName);
         return null;
     }
 
     @Specialization(guards = {"!isRubyModule(object)", "!isRubyBignum(object)"})
     public Object alias(RubyBasicObject object) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         object.getSingletonClass(this).alias(this, newName, oldName);
         return null;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchReturnAsErrorNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/CatchReturnAsErrorNode.java
@@ -31,8 +31,6 @@ public CatchReturnAsErrorNode(RubyContext context, SourceSection sourceSection,
 
     @Override
     public Object execute(VirtualFrame frame) {
-        notDesignedForCompilation();
-
         try {
             return body.execute(frame);
         } catch (ReturnException e) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/MethodDefinitionNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/MethodDefinitionNode.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes.methods;
 
 import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
@@ -41,7 +42,7 @@ public MethodDefinitionNode(RubyContext context, SourceSection sourceSection, St
     }
 
     public InternalMethod executeMethod(VirtualFrame frame) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         final MaterializedFrame declarationFrame;
 
@@ -51,12 +52,6 @@ public InternalMethod executeMethod(VirtualFrame frame) {
             declarationFrame = null;
         }
 
-        return executeMethod(frame, declarationFrame);
-    }
-
-    public InternalMethod executeMethod(VirtualFrame frame, MaterializedFrame declarationFrame) {
-        notDesignedForCompilation();
-
         return new InternalMethod(sharedMethodInfo, name, null, null, false, callTarget, declarationFrame);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/SetMethodDeclarationContext.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/SetMethodDeclarationContext.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.methods;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -34,7 +35,7 @@ public SetMethodDeclarationContext(RubyContext context, SourceSection sourceSect
 
     @Override
     public Object execute(VirtualFrame frame) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         FrameSlot slot = frame.getFrameDescriptor().findOrAddFrameSlot(RubyModule.VISIBILITY_FRAME_SLOT_ID, "visibility for " + what, FrameSlotKind.Object);
         Object oldVisibility = frame.getValue(slot);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/SymbolProcNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/SymbolProcNode.java
@@ -32,8 +32,6 @@ public SymbolProcNode(RubyContext context, SourceSection sourceSection, String s
 
     @Override
     public Object execute(VirtualFrame frame) {
-        notDesignedForCompilation();
-
         final Object[] args = frame.getArguments();
         final Object receiver = RubyArguments.getUserArgument(args, 0);
         final Object[] arguments = RubyArguments.extractUserArguments(args);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/UndefNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/UndefNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.methods;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
@@ -29,7 +30,7 @@ public UndefNode(RubyContext context, SourceSection sourceSection, RubyNode modu
 
     @Override
     public void executeVoid(VirtualFrame frame) {
-        notDesignedForCompilation();
+        CompilerDirectives.transferToInterpreter();
 
         final RubyModule moduleObject;