[Truffle] Workaround problem with instrumentation order for duplicate…

…d block bodies, in order to fix coverage.
jruby · Nov 23, 2015 · f24e0ac · f24e0ac
1 parent e19a173
commit f24e0ac
Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/test/truffle/coverage/test.rb b/test/truffle/coverage/test.rb
@@ -4,10 +4,7 @@
 
 require_relative 'subject.rb'
 
-data = Coverage.result.values.first
-expected = [1, 1, nil, 1,  0, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]
-           #[1, 1, nil, 1, 10, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]
-
-p data
+data = Coverage.result[File.join(File.dirname(__FILE__), 'subject.rb')]
+expected = [1, 1, nil, 1, 10, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]
 
 raise 'failed' unless data == expected
diff --git a/test/truffle/integration-tests.sh b/test/truffle/integration-tests.sh
@@ -44,5 +44,5 @@ test_server
 #bin/jruby -X+T -Ilib/ruby/gems/shared/gems/rack-1.6.4/lib -Ilib/ruby/gems/shared/gems/tilt-2.0.1/lib -Ilib/ruby/gems/shared/gems/rack-protection-1.5.3/lib -Ilib/ruby/gems/shared/gems/sinatra-1.4.6/lib test/truffle/simple-sinatra-server.rb &
 #test_server
 
-#echo "Coverage..."
-#bin/jruby -X+T -Xtruffle.coverage=true test/truffle/coverage/test.rb
+echo "Coverage..."
+bin/jruby -X+T -Xtruffle.coverage=true test/truffle/coverage/test.rb
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -107,22 +107,23 @@ public BlockDefinitionNode compileBlockNode(SourceSection sourceSection, String
                 NodeUtil.cloneNode(loadArguments));
 
         // Procs
-        final RubyNode bodyProc = new CatchForProcNode(context, sourceSection, composeBody(preludeProc, body));
+        final RubyNode bodyProc = new CatchForProcNode(context, sourceSection, composeBody(preludeProc, (RubyNode) body.deepCopy()));
 
         final RubyRootNode newRootNodeForProcs = new RubyRootNode(context, sourceSection, environment.getFrameDescriptor(), environment.getSharedMethodInfo(),
                 bodyProc, environment.needsDeclarationFrame());
 
         // Lambdas
-        final RubyNode bodyLambda = new CatchForLambdaNode(context, sourceSection, composeBody(preludeLambda, body), environment.getReturnID());
+        final RubyNode bodyLambda = new CatchForLambdaNode(context, sourceSection, composeBody(preludeLambda, (RubyNode) body.deepCopy()), environment.getReturnID());
 
         final RubyRootNode newRootNodeForLambdas = new RubyRootNode(
                 context, sourceSection,
                 environment.getFrameDescriptor(), environment.getSharedMethodInfo(),
                 bodyLambda,
                 environment.needsDeclarationFrame());
 
-        final CallTarget callTargetAsProc = Truffle.getRuntime().createCallTarget(newRootNodeForProcs);
+        // TODO CS 23-Nov-15 only the second one will get instrumented properly!
         final CallTarget callTargetAsLambda = Truffle.getRuntime().createCallTarget(newRootNodeForLambdas);
+        final CallTarget callTargetAsProc = Truffle.getRuntime().createCallTarget(newRootNodeForProcs);
 
         return new BlockDefinitionNode(context, sourceSection, type, environment.getSharedMethodInfo(),
                 callTargetAsProc, callTargetAsLambda, environment.getBreakID());