jruby · Apr 7, 2015 · Apr 7, 2015 · Apr 7, 2015
diff --git a/spec/truffle/tags/core/encoding/converter/asciicompat_encoding_tags.txt b/spec/truffle/tags/core/encoding/converter/asciicompat_encoding_tags.txt
diff --git a/spec/truffle/tags/core/encoding/converter/convert_tags.txt b/spec/truffle/tags/core/encoding/converter/convert_tags.txt
@@ -1,2 +1 @@
-fails:Encoding::Converter#convert raises UndefinedConversionError if the String contains characters invalid for the target encoding
 fails:Encoding::Converter#convert raises an ArgumentError if called on a finished stream
diff --git a/spec/truffle/tags/core/encoding/converter/last_error_tags.txt b/spec/truffle/tags/core/encoding/converter/last_error_tags.txt
@@ -1,4 +1,2 @@
 fails:Encoding::Converter#last_error returns an Encoding::InvalidByteSequenceError when #primitive_convert last returned :invalid_byte_sequence
-fails:Encoding::Converter#last_error returns an Encoding::UndefinedConversionError when #primitive_convert last returned :undefined_conversion
 fails:Encoding::Converter#last_error returns an Encoding::InvalidByteSequenceError when the last call to #convert produced one
-fails:Encoding::Converter#last_error returns an Encoding::UndefinedConversionError when the last call to #convert produced one
diff --git a/spec/truffle/tags/core/encoding/converter/replacement_tags.txt b/spec/truffle/tags/core/encoding/converter/replacement_tags.txt
diff --git a/spec/truffle/tags/core/encoding/invalid_byte_sequence_error/source_encoding_name_tags.txt b/spec/truffle/tags/core/encoding/invalid_byte_sequence_error/source_encoding_name_tags.txt
diff --git a/.../truffle/tags/core/encoding/undefined_conversion_error/destination_encoding_name_tags.txt b/.../truffle/tags/core/encoding/undefined_conversion_error/destination_encoding_name_tags.txt
diff --git a/spec/truffle/tags/core/encoding/undefined_conversion_error/destination_encoding_tags.txt b/spec/truffle/tags/core/encoding/undefined_conversion_error/destination_encoding_tags.txt
diff --git a/spec/truffle/tags/core/encoding/undefined_conversion_error/error_char_tags.txt b/spec/truffle/tags/core/encoding/undefined_conversion_error/error_char_tags.txt
@@ -1,3 +1 @@
-fails:Encoding::UndefinedConversionError#error_char returns a String
 fails:Encoding::UndefinedConversionError#error_char returns the one-character String that caused the exception
-fails:Encoding::UndefinedConversionError#error_char uses the source encoding
diff --git a/spec/truffle/tags/core/encoding/undefined_conversion_error/source_encoding_name_tags.txt b/spec/truffle/tags/core/encoding/undefined_conversion_error/source_encoding_name_tags.txt
diff --git a/spec/truffle/tags/core/encoding/undefined_conversion_error/source_encoding_tags.txt b/spec/truffle/tags/core/encoding/undefined_conversion_error/source_encoding_tags.txt
diff --git a/spec/truffle/tags/core/string/encode_tags.txt b/spec/truffle/tags/core/string/encode_tags.txt
@@ -1,4 +1,4 @@
-fails:String#encode given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
-fails:String#encode given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
-fails:String#encode! given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
-fails:String#encode! given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
+fails(inherited - rubinius):String#encode given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
+fails(inherited - rubinius):String#encode given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
+fails(inherited - rubinius):String#encode! given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
+fails(inherited - rubinius):String#encode! given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingConverterNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingConverterNodes.java
@@ -17,27 +17,20 @@
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
 import org.jcodings.transcode.EConv;
-import org.jcodings.transcode.Transcoder;
+import org.jcodings.transcode.EConvFlags;
 import org.jcodings.transcode.TranscoderDB;
 import org.jcodings.util.CaseInsensitiveBytesHash;
 import org.jcodings.util.Hash;
 import org.jruby.Ruby;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.UndefinedPlaceholder;
 import org.jruby.truffle.runtime.core.*;
-import org.jruby.truffle.runtime.hash.HashOperations;
-import org.jruby.truffle.runtime.hash.KeyValue;
 import org.jruby.util.ByteList;
 import org.jruby.util.io.EncodingUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @CoreClass(name = "Encoding::Converter")
 public abstract class EncodingConverterNodes {
 
@@ -75,7 +68,7 @@ public RubyNilClass initialize(RubyEncodingConverter self, Object source, Object
             // by Rubinius.  Rubinius will do the heavy lifting of parsing the options hash and setting the `@options`
             // ivar to the resulting int for EConv flags.  Since we don't pass the proper data structures to EncodingUtils,
             // we must override the flags after its had a pass in order to correct the bad flags value.
-            ecflags[0] = (int) self.getInstanceVariable("@options");
+            ecflags[0] = rubiniusToJRubyFlags((int) self.getInstanceVariable("@options"));
 
             EConv econv = EncodingUtils.econvOpenOpts(runtime.getCurrentContext(), encNames[0], encNames[1], ecflags[0], ecopts[0]);
 
@@ -100,6 +93,23 @@ public RubyNilClass initialize(RubyEncodingConverter self, Object source, Object
             return nil();
         }
 
+        /**
+         * Rubinius and JRuby process Encoding::Converter options flags differently.  Rubinius splits the processing
+         * between initial setup and the replacement value setup, whereas JRuby handles them all during initial setup.
+         * We figure out what flags JRuby additionally expects to be set and set them to satisfy EConv.
+         */
+        private int rubiniusToJRubyFlags(int flags) {
+            if ((flags & EConvFlags.XML_TEXT_DECORATOR) != 0) {
+                flags |= EConvFlags.UNDEF_HEX_CHARREF;
+            }
+
+            if ((flags & EConvFlags.XML_ATTR_CONTENT_DECORATOR) != 0) {
+                flags |= EConvFlags.UNDEF_HEX_CHARREF;
+            }
+
+            return flags;
+        }
+
     }
 
     @RubiniusOnly
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Encoding::Converter#convert raises UndefinedConversionError if the String contains characters invalid for the target encoding
		fails:Encoding::Converter#convert raises an ArgumentError if called on a finished stream