[Truffle] Fixed marshaling of Regexps.

jruby · Jan 5, 2016 · a44ecd8 · a44ecd8
1 parent 23fb07d
commit a44ecd8
Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/spec/truffle/tags/core/marshal/dump_tags.txt b/spec/truffle/tags/core/marshal/dump_tags.txt
@@ -1,10 +1,3 @@
-fails:Marshal.dump with a Regexp dumps a Regexp
-fails:Marshal.dump with a Regexp dumps a Regexp with flags
-fails:Marshal.dump with a Regexp dumps a Regexp with instance variables
-fails:Marshal.dump with a Regexp dumps an extended Regexp
-fails:Marshal.dump with a Regexp dumps a Regexp subclass
-fails:Marshal.dump with a Regexp dumps a UTF-8 Regexp
-fails:Marshal.dump with a Regexp dumps a Regexp in another encoding
 fails:Marshal.dump with an Object dumps a BasicObject subclass if it defines respond_to?
 fails:Marshal.dump with a Time dumps the zone and the offset
 fails:Marshal.dump with a Time dumps the zone, but not the offset if zone is UTC

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/EncodingPrimitiveNodes.java
@@ -44,7 +44,12 @@ public DynamicObject encodingGetObjectEncoding(DynamicObject encoding) {
             return encoding;
         }
 
-        @Specialization(guards = {"!isRubyString(object)", "!isRubySymbol(object)", "!isRubyEncoding(object)"})
+        @Specialization(guards = "isRubyRegexp(regexp)")
+        public DynamicObject encodingGetObjectEncodingRegexp(DynamicObject regexp) {
+            return EncodingNodes.getEncoding(Layouts.REGEXP.getSource(regexp).getEncoding());
+        }
+
+        @Specialization(guards = {"!isRubyString(object)", "!isRubySymbol(object)", "!isRubyEncoding(object)", "!isRubyRegexp(object)"})
         public DynamicObject encodingGetObjectEncodingNil(DynamicObject object) {
             // TODO(CS, 26 Jan 15) something to do with __encoding__ here?
             return nil();