Fix precompiled execution broken by MethodNodes.

Precompiled method definition does not have access to an AST, so there's no way to build a MethodNodes object usable by Truffle. We will null out MethodNodes for now and look to (possibly) add AST to precompiled classes for #1395.
jruby · Jan 10, 2014 · 778ab12 · 778ab12
1 parent 5588b7c
commit 778ab12
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/compiler/impl/BaseBodyCompiler.java b/core/src/main/java/org/jruby/compiler/impl/BaseBodyCompiler.java
@@ -2723,10 +2723,10 @@ public void defineNewMethod(String name, int methodArity, StaticScope scope,
 
         if (receiver != null) {
             invokeUtilityMethod("defs", sig(IRubyObject.class,
-                    params(ThreadContext.class, IRubyObject.class, IRubyObject.class, Object.class, String.class, String.class, StaticScope.class, int.class, String.class, int.class, CallConfiguration.class, String.class, MethodNodes.class)));
+                    params(ThreadContext.class, IRubyObject.class, IRubyObject.class, Object.class, String.class, String.class, StaticScope.class, int.class, String.class, int.class, CallConfiguration.class, String.class)));
         } else {
             invokeUtilityMethod("def", sig(IRubyObject.class,
-                    params(ThreadContext.class, IRubyObject.class, Object.class, String.class, String.class, StaticScope.class, int.class, String.class, int.class, CallConfiguration.class, String.class, MethodNodes.class)));
+                    params(ThreadContext.class, IRubyObject.class, Object.class, String.class, String.class, StaticScope.class, int.class, String.class, int.class, CallConfiguration.class, String.class)));
         }
 
         script.addInvokerDescriptor(name, newMethodName, methodArity, scope, inspector.getCallConfig(), filename, line, methodNodes);

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/CompiledMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/CompiledMethod.java
@@ -239,6 +239,12 @@ public String[] getParameterList() {
         }
 
     }
+
+    // Called by Class.newInstance in InvocationMethodCompiler and precompiled method subclasses
+    public CompiledMethod() {
+        // TODO: Need to have access to AST for recompilation. See #1395
+        this(null);
+    }
 
     protected CompiledMethod(MethodNodes methodNodes) {
         this.methodNodes = methodNodes;

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/MethodNodes.java b/core/src/main/java/org/jruby/internal/runtime/methods/MethodNodes.java
@@ -19,7 +19,6 @@ public class MethodNodes {
 
     public MethodNodes(ArgsNode argsNode, Node bodyNode) {
         assert argsNode != null;
-        assert bodyNode != null;
 
         this.argsNode = argsNode;
         this.bodyNode = bodyNode;

diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -285,9 +285,15 @@ public static Block createSharedScopeBlock(ThreadContext context, IRubyObject se
         return CompiledSharedScopeBlock.newCompiledSharedScopeClosure(context, self, Arity.createArity(arity),
                 context.getCurrentScope(), callback, hasMultipleArgsHead, argsNodeType);
     }
-    
+
     public static IRubyObject def(ThreadContext context, IRubyObject self, Object scriptObject, String rubyName, String javaName, StaticScope scope,
-            int arity, String filename, int line, CallConfiguration callConfig, String parameterDesc, MethodNodes methodNodes) {
+                                  int arity, String filename, int line, CallConfiguration callConfig, String parameterDesc) {
+        // TODO: Need to have access to AST for recompilation. See #1395
+        return def(context, self, scriptObject, rubyName, javaName, scope, arity, filename, line, callConfig, parameterDesc, null);
+    }
+
+    public static IRubyObject def(ThreadContext context, IRubyObject self, Object scriptObject, String rubyName, String javaName, StaticScope scope,
+                                  int arity, String filename, int line, CallConfiguration callConfig, String parameterDesc, MethodNodes methodNodes) {
         Class compiledClass = scriptObject.getClass();
         Ruby runtime = context.runtime;
 
@@ -306,6 +312,12 @@ rubyName, containingClass, new SimpleSourcePosition(filename, line), arity, scop
         return addInstanceMethod(containingClass, rubyName, method, currVisibility, context, runtime);
     }
 
+    public static IRubyObject defs(ThreadContext context, IRubyObject self, IRubyObject receiver, Object scriptObject, String rubyName, String javaName, StaticScope scope,
+                                   int arity, String filename, int line, CallConfiguration callConfig, String parameterDesc) {
+        // TODO: Need to have access to AST for recompilation. See #1395
+        return defs(context, self, receiver, scriptObject, rubyName, javaName, scope, arity, filename, line, callConfig, parameterDesc, null);
+    }
+
     public static IRubyObject defs(ThreadContext context, IRubyObject self, IRubyObject receiver, Object scriptObject, String rubyName, String javaName, StaticScope scope,
             int arity, String filename, int line, CallConfiguration callConfig, String parameterDesc, MethodNodes methodNodes) {
         Class compiledClass = scriptObject.getClass();