Rewriting SREModuleBuiltins

Author: ppisl

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java

@@ -58,6 +58,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -68,6 +69,7 @@
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
@@ -253,26 +255,21 @@ Object run(Object o) {
 
     }
 
-    @Builtin(name = "tregex_call_safe", minNumOfArguments = 1, takesVariableArguments = true)
+    @Builtin(name = "tregex_call_safe", fixedNumOfArguments = 3)
+    @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     abstract static class TRegexCallSafe extends PythonBuiltinNode {
-        @Specialization(guards = "isForeignObject(callable)")
-        Object call(TruffleObject callable, Object[] arguments,
+
+        private Node invokeNode;
+
+        private Object doIt(TruffleObject callable, String arg1, Object arg2,
                         @Cached("create()") BranchProfile runtimeError,
-                        @Cached("create()") BranchProfile typeError,
-                        @Cached("createExecute()") Node invokeNode) {
+                        @Cached("create()") BranchProfile typeError) {
+            if (invokeNode == null) {
+                invokeNode = Message.createExecute(0).createNode();
+            }
             try {
-                // TODO This is a hack. The right solution would be to fix it
-                // in
-                // com.oracle.truffle.regex.RegexEngine.RegexEngineMessageResolution.RegexEngineExecuteNode
-                // where is only check whether the argument is instance of String.
-                // PString should be there unboxed.
-                for (int i = 0; i < arguments.length; i++) {
-                    if (arguments[i] instanceof PString) {
-                        arguments[i] = ((PString) arguments[i]).getValue();
-                    }
-                }
-                return ForeignAccess.sendExecute(invokeNode, callable, arguments);
+                return ForeignAccess.sendExecute(invokeNode, callable, new Object[]{arg1, arg2});
             } catch (ArityException | UnsupportedTypeException | UnsupportedMessageException e) {
                 typeError.enter();
                 throw raise(TypeError, "%s", e);
@@ -282,10 +279,19 @@ Object call(TruffleObject callable, Object[] arguments,
             }
         }
 
-        protected static Node createExecute() {
-            return Message.createExecute(0).createNode();
+        @Specialization(guards = "isForeignObject(callable)")
+        Object call(TruffleObject callable, String arg1, String arg2,
+                        @Cached("create()") BranchProfile runtimeError,
+                        @Cached("create()") BranchProfile typeError) {
+            return doIt(callable, arg1, arg2, runtimeError, typeError);
+        }
+
+        @Specialization(guards = "isForeignObject(callable)")
+        Object call(TruffleObject callable, String arg1, int arg2,
+                        @Cached("create()") BranchProfile runtimeError,
+                        @Cached("create()") BranchProfile typeError) {
+            return doIt(callable, arg1, arg2, runtimeError, typeError);
         }
 
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/LazyString.java

@@ -67,8 +67,8 @@ private static int lengthIntl(CharSequence cs) {
 
     @TruffleBoundary
     public static CharSequence create(CharSequence left, CharSequence right) {
-        assert PGuards.isString(left);
-        assert PGuards.isString(right);
+        assert PGuards.isString(left) || left instanceof LazyString;
+        assert PGuards.isString(right) || right instanceof LazyString;
         if (UseLazyStrings) {
             if (left.length() == 0) {
                 return right;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -1107,12 +1107,16 @@ String rstrip(String self, PNone chars) {
 
     @Builtin(name = SpecialMethodNames.__LEN__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
-    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class LenNode extends PythonUnaryBuiltinNode {
         @Specialization
         public int len(String self) {
             return self.length();
         }
+
+        @Specialization
+        public int len(PString self) {
+            return self.len();
+        }
     }
 
     @Builtin(name = "index", minNumOfArguments = 2, maxNumOfArguments = 4)