[GR-32332] Backports for 20.2

PullRequest: truffleruby/2770

Author: eregon

.gitattributes

@@ -1,7 +1,3 @@
-# Merge options
-
-/CHANGELOG.md merge=union
-
 # Rules for GitHub's Linguist language-classification system. We're abusing the
 # 'vendored' attribute to exclude files as a lot of this isn't really vendored,
 # and a whole lot of actually vendored code isn't listed! What we want to do is

lib/truffle/truffle/cext_preprocessor.rb

@@ -96,7 +96,9 @@ def self.patch(file, contents, directory)
             # preprocessor macro which _must_ end with a newline and
             # so requires that we preserve the trailing whitespace.
             patched_file[:patches].each do |patch|
-              last_line = patch[:replacement].rstrip.lines.last.lstrip
+              replacement = patch[:replacement].rstrip
+              last_line = replacement.lines.last || replacement # .lines returns an empty Array if String#empty?
+              last_line = last_line.lstrip
               contents = contents.gsub(patch[:match],
                                        if last_line && last_line.start_with?('#')
                                          patch[:replacement]

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -68,6 +68,10 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             final String launcher = ProcessProperties.getExecutableName();
             polyglotOptions.put(OptionsCatalog.LAUNCHER.getName(), launcher);
         }
+
+        // Instrumentation should not swallow exceptions, especially exceptions from Truffle safepoints (GR-32154)
+        polyglotOptions.put("engine.InstrumentExceptionsAreThrown", "true");
+        // TruffleRuby is never distributed without the GraalVM compiler, so this warning is not necessary
         polyglotOptions.put("engine.WarnInterpreterOnly", "false");
 
         config = new CommandLineOptions();

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

test/truffle/cexts/test-preprocess.rb renamed to test/truffle/cexts/test_preprocess.rb

@@ -56,7 +56,22 @@ def test_patch(file, directory, input, expected)
 }
 EOF
 
+json_original = <<-EOF
+# else
+rb_str_resize(*result, RSTRING_LEN(*result));
+# endif
+EOF
+
+json_patched = <<-EOF
+# else
+
+# endif
+EOF
+
 test_patch 'xml_sax_parser.c', 'ext/nokogiri', original, modified
 # Should not patch other files or other gems
 test_patch 'other_file.c', 'ext/nokogiri', original, original
 test_patch 'xml_sax_parser.c', 'ext/other_gem', original, original
+
+# Tests an empty replacement
+test_patch 'parser.c', 'ext/json/ext/parser', json_original, json_patched

tool/jt.rb

@@ -1152,14 +1152,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.
@@ -1203,7 +1204,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)
@@ -1278,7 +1279,7 @@ def retag(*args)
       case test_name
       when 'tools'
         # Test tools
-        run_ruby 'test/truffle/cexts/test-preprocess.rb'
+        run_ruby 'test/truffle/cexts/test_preprocess.rb'
 
       when 'minimum', 'method', 'module', 'globals', 'backtraces', 'xopenssl'
         # Test that we can compile and run some very basic C extensions