[GR-17457] Enable assertions and other flags for subprocess in MRI tests

PullRequest: truffleruby/2762

Author: eregon

src/main/java/org/truffleruby/core/array/ArrayAppendOneNode.java

@@ -25,7 +25,7 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @NodeChild(value = "array", type = RubyNode.class)
-@NodeChild(value = "value", type = RubyNode.class)
+@NodeChild(value = "valueNode", type = RubyNode.class)
 @ImportStatic(ArrayGuards.class)
 public abstract class ArrayAppendOneNode extends RubyContextSourceNode {
 
@@ -37,6 +37,8 @@ public static ArrayAppendOneNode create() {
 
     public abstract RubyArray executeAppendOne(RubyArray array, Object value);
 
+    public abstract RubyNode getValueNode();
+
     // Append of the correct type
 
     @Specialization(

src/main/java/org/truffleruby/language/dispatch/RubyCallNode.java

@@ -11,6 +11,7 @@
 
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.core.array.ArrayAppendOneNode;
 import org.truffleruby.core.array.ArrayToObjectArrayNode;
 import org.truffleruby.core.array.ArrayToObjectArrayNodeGen;
 import org.truffleruby.core.array.AssignableNode;
@@ -100,8 +101,8 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public void assign(VirtualFrame frame, Object value) {
-        assert getLastArgumentNode() instanceof NilLiteralNode &&
-                ((NilLiteralNode) getLastArgumentNode()).isImplicit() : getLastArgumentNode();
+        assert (getLastArgumentNode() instanceof NilLiteralNode &&
+                ((NilLiteralNode) getLastArgumentNode()).isImplicit()) : getLastArgumentNode();
 
         final Object receiverObject = receiver.execute(frame);
         if (isSafeNavigation && nilProfile.profile(receiverObject == nil)) {
@@ -195,7 +196,11 @@ public boolean hasLiteralBlock() {
     }
 
     private RubyNode getLastArgumentNode() {
-        return arguments[arguments.length - 1];
+        final RubyNode lastArg = arguments[arguments.length - 1];
+        if (isSplatted && lastArg instanceof ArrayAppendOneNode) {
+            return ((ArrayAppendOneNode) lastArg).getValueNode();
+        }
+        return lastArg;
     }
 
     @Override

tool/jt.rb

@@ -1166,14 +1166,15 @@ def test(*args)
 
     truffle_args = []
     if truffleruby?
-      truffle_args += %w(--reveal --vm.Xmx2G)
+      vm_args, ruby_args, _parsed_options = ruby_options({}, %w[--vm.Xmx2G --reveal --experimental-options --testing-rubygems])
+      truffle_args = vm_args + ruby_args
     end
 
     env_vars = {
       'EXCLUDES' => 'test/mri/excludes',
       'RUBYGEMS_TEST_PATH' => "#{MRI_TEST_PREFIX}/rubygems",
       'RUBYOPT' => [*ENV['RUBYOPT'], '--disable-gems'].join(' '),
-      'TRUFFLERUBYOPT' => [*ENV['TRUFFLERUBYOPT'], '--experimental-options', '--testing-rubygems'].join(' '),
+      'TRUFFLERUBYOPT' => [*ENV['TRUFFLERUBYOPT'], *truffle_args].join(' '),
     }
     compile_env = {
       # MRI C-ext tests expect to be built with $extmk = true.
@@ -1217,7 +1218,7 @@ def test(*args)
 
     command = %w[test/mri/tests/runner.rb -v --color=never --tty=no -q]
     command.unshift("-I#{TRUFFLERUBY_DIR}/.ext")  if !cext_tests.empty?
-    run_ruby(env_vars, *truffle_args, *extra_args, *command, *test_files, *runner_args, run_options)
+    run_ruby(env_vars, *extra_args, *command, *test_files, *runner_args, run_options)
   end
 
   def retag(*args)