[GR-29508] Don't patch nokogiri when using packaged libraries.

PullRequest: truffleruby/2434

Author: aardvark179

lib/truffle/truffle/cext_preprocessor.rb

@@ -91,8 +91,18 @@ def self.patch(file, contents, directory)
                       directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
                     end
           if matched
+            # Generally we strip any trailing newlines and whitespce
+            # from a patch, but on occasions we need to patch with a
+            # preprocessor macro which _must_ end with a newline and
+            # so requires that we preserve the trailing whitespace.
             patched_file[:patches].each do |patch|
-              contents = contents.gsub(patch[:match], patch[:replacement].rstrip)
+              last_line = patch[:replacement].rstrip.lines.last.lstrip
+              contents = contents.gsub(patch[:match],
+                                       if last_line && last_line.start_with?('#')
+                                         patch[:replacement]
+                                       else
+                                         patch[:replacement].rstrip
+                                       end)
             end
           end
         end

lib/truffle/truffle/patches/nokogiri_patches.rb

@@ -23,6 +23,16 @@ class NokogiriPatches
   xmlDocPtr doc = (xmlDocPtr)c;
 EOF
 
+  def self.patch_for_system_libraries(replacement)
+    <<-EOF
+#ifdef NOKOGIRI_PACKAGED_LIBRARIES
+\\&
+#else
+#{replacement}
+#endif
+EOF
+  end
+
   PATCHES = {
     gem: 'nokogiri',
     patches: {
@@ -31,14 +41,14 @@ class NokogiriPatches
           # is called with. This works on MRI but causes an error in
           # TruffleRuby.
           match: 'static VALUE to_array(VALUE self, VALUE rb_node)',
-          replacement: 'static VALUE to_array(VALUE self)'
+          replacement: patch_for_system_libraries('static VALUE to_array(VALUE self)')
         },
       ],
       'xslt_stylesheet.c' => [
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: 'va_list args;',
-          replacement: 'va_list args; rb_str_cat2(ctx, "Generic error"); return;'
+          replacement: patch_for_system_libraries('va_list args; rb_str_cat2(ctx, "Generic error"); return;')
         }
       ],
       'xml_document.c' => [
@@ -51,31 +61,31 @@ class NokogiriPatches
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: /va_list args;[^}]*id_warning, 1, ruby_message\);/,
-          replacement: 'rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));'
+          replacement: patch_for_system_libraries('rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));')
         },
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: /va_list args;[^}]*id_error, 1, ruby_message\);/,
-          replacement: 'rb_funcall(doc, id_error, 1, NOKOGIRI_STR_NEW2("Warning."));'
+          replacement: patch_for_system_libraries('rb_funcall(doc, id_error, 1, NOKOGIRI_STR_NEW2("Warning."));')
         }
       ],
       'xml_xpath_context.c' => [
         { # It is not currently possible to pass var args from native
           # functions to sulong, so we work round the issue here.
           match: 'va_list args;',
-          replacement: 'va_list args; rb_raise(rb_eRuntimeError, "%s", "Exception:"); return;'
+          replacement: patch_for_system_libraries('va_list args; rb_raise(rb_eRuntimeError, "%s", "Exception:"); return;')
         },
         {
           match: 'VALUE thing = Qnil;',
-          replacement: "VALUE thing = Qnil;\n  VALUE errors = rb_ary_new();"
+          replacement: patch_for_system_libraries("VALUE thing = Qnil;\nVALUE errors = rb_ary_new();")
         },
         {
           match: 'xmlSetStructuredErrorFunc(NULL, Nokogiri_error_raise);',
-          replacement: 'xmlSetStructuredErrorFunc(errors, Nokogiri_error_array_pusher);'
+          replacement: patch_for_system_libraries('xmlSetStructuredErrorFunc(errors, Nokogiri_error_array_pusher);')
         },
         {
           match: 'if(xpath == NULL)',
-          replacement: "if (RARRAY_LEN(errors) > 0) { rb_exc_raise(rb_ary_entry(errors, 0)); }\nif(xpath == NULL)"
+          replacement: patch_for_system_libraries("if (RARRAY_LEN(errors) > 0) { rb_exc_raise(rb_ary_entry(errors, 0)); }\nif(xpath == NULL)")
         },
       ],
     }

test/truffle/cexts/test-preprocess.rb

@@ -40,7 +40,19 @@ def test_patch(file, directory, input, expected)
   char * message;
   VALUE ruby_message;
 
-  rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));
+  #ifdef NOKOGIRI_PACKAGED_LIBRARIES
+va_list args;
+  va_start(args, msg);
+  vasprintf(&message, msg, args);
+  va_end(args);
+
+  ruby_message = NOKOGIRI_STR_NEW2(message);
+  vasprintf_free(message);
+  rb_funcall(doc, id_warning, 1, ruby_message);
+#else
+rb_funcall(doc, id_warning, 1, NOKOGIRI_STR_NEW2("Warning."));
+#endif
+
 }
 EOF