jruby · Jun 4, 2015 · Jun 4, 2015
Showing with 36 additions and 8 deletions.

+0 −1 spec/truffle/tags/core/regexp/initialize_tags.txt

+25 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpGuards.java

+11 −7 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
diff --git a/spec/truffle/tags/core/regexp/initialize_tags.txt b/spec/truffle/tags/core/regexp/initialize_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RegexpGuards.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+
+package org.jruby.truffle.nodes.core;
+
+import org.jruby.truffle.runtime.core.RubyRegexp;
+
+public class RegexpGuards {
+
+    public static boolean isInitialized(RubyRegexp regexp) {
+        return regexp.getRegex() != null;
+    }
+
+    public static boolean isRegexpLiteral(RubyRegexp regexp) {
+        return regexp.getOptions().isLiteral();
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
@@ -11,10 +11,12 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
 import org.joni.Matcher;
 import org.joni.Regex;
+import org.jruby.truffle.nodes.core.RegexpGuards;
 import org.jruby.truffle.nodes.core.StringNodes;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
@@ -48,6 +50,7 @@ public boolean fixedEncoding(RubyRegexp regexp) {
     }
 
     @RubiniusPrimitive(name = "regexp_initialize")
+    @ImportStatic(RegexpGuards.class)
     public static abstract class RegexpInitializePrimitiveNode extends RubiniusPrimitiveNode {
 
         public RegexpInitializePrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -60,18 +63,22 @@ public RubyRegexp initializeRegexpLiteral(RubyRegexp regexp, RubyString pattern,
             throw new RaiseException(getContext().getCoreLibrary().securityError("can't modify literal regexp", this));
         }
 
-        @Specialization(guards = "!isRegexpLiteral(regexp)")
+        @Specialization(guards = { "!isRegexpLiteral(regexp)", "isInitialized(regexp)" })
+        public RubyRegexp initializeAlreadyInitialized(RubyRegexp regexp, RubyString pattern, int options) {
+            CompilerDirectives.transferToInterpreter();
+            throw new RaiseException(getContext().getCoreLibrary().typeError("already initialized regexp", this));
+        }
+
+        @Specialization(guards = { "!isRegexpLiteral(regexp)", "!isInitialized(regexp)" })
         public RubyRegexp initialize(RubyRegexp regexp, RubyString pattern, int options) {
             regexp.initialize(this, StringNodes.getByteList(pattern), options);
             return regexp;
         }
 
-        public static boolean isRegexpLiteral(RubyRegexp regexp) {
-            return regexp.getOptions().isLiteral();
-        }
     }
 
     @RubiniusPrimitive(name = "regexp_options")
+    @ImportStatic(RegexpGuards.class)
     public static abstract class RegexpOptionsPrimitiveNode extends RubiniusPrimitiveNode {
 
         public RegexpOptionsPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -89,9 +96,6 @@ public int optionsNotInitialized(RubyRegexp regexp) {
             throw new RaiseException(getContext().getCoreLibrary().typeError("uninitialized Regexp", this));
         }
 
-        public static boolean isInitialized(RubyRegexp regexp) {
-            return regexp.getRegex() != null;
-        }
     }
 
     @RubiniusPrimitive(name = "regexp_search_region", lowerFixnumParameters = {1, 2})