Fix interop exception handling and use explicit wrapper für TRegex.

Author: fangerer

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

@@ -40,6 +40,9 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.RuntimeError;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
+
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -53,16 +56,26 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.str.PString;
 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.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 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.interop.ArityException;
+import com.oracle.truffle.api.interop.ForeignAccess;
+import com.oracle.truffle.api.interop.Message;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.UnsupportedTypeException;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.BranchProfile;
 
 @CoreFunctions(defineModule = "_sre")
 public class SREModuleBuiltins extends PythonBuiltins {
@@ -240,4 +253,29 @@ Object run(Object o) {
 
     }
 
+    @Builtin(name = "tregex_call_safe", minNumOfArguments = 1, takesVariableArguments = true)
+    @GenerateNodeFactory
+    abstract static class TRegexCallSafe extends PythonBuiltinNode {
+        @Specialization(guards = "isForeignObject(callable)")
+        Object call(TruffleObject callable, Object[] arguments,
+                        @Cached("create()") BranchProfile runtimeError,
+                        @Cached("create()") BranchProfile typeError,
+                        @Cached("createExecute()") Node invokeNode) {
+            try {
+                return ForeignAccess.sendExecute(invokeNode, callable, arguments);
+            } catch (ArityException | UnsupportedTypeException | UnsupportedMessageException e) {
+                typeError.enter();
+                throw raise(TypeError, e.getMessage());
+            } catch (RuntimeException e) {
+                runtimeError.enter();
+                throw raise(RuntimeError, e.getMessage());
+            }
+        }
+
+        protected static Node createExecute() {
+            return Message.createExecute(0).createNode();
+        }
+
+    }
+
 }

graalpython/lib-graalpython/_sre.py

@@ -153,7 +153,7 @@ def __init__(self, pattern, flags, code, groups=0, groupindex=None, indexgroup=N
 
     def __tregex_compile(self, pattern):
         if TREGEX_ENGINE is not None:
-            return TREGEX_ENGINE(pattern, self.jsflags)
+            return tregex_call_safe(TREGEX_ENGINE, pattern, self.jsflags)
         raise RuntimeError("TREGEX engine not available")
 
 
@@ -211,9 +211,9 @@ def _search(self, pattern, string, pos, endpos):
         pattern = self.__tregex_compile(pattern)
         string = self._decode_string(string)
         if endpos == -1 or endpos >= len(string):
-            result = pattern.exec(string, pos)
+            result = tregex_call_safe(pattern.exec, string, pos)
         else:
-            result = pattern.exec(string[:endpos], pos)
+            result = tregex_call_safe(pattern.exec, string[:endpos], pos)
         if result.isMatch:
             return SRE_Match(self, pos, endpos, result)
         else:
@@ -255,7 +255,7 @@ def findall(self, string, pos=0, endpos=-1):
                 endpos = endpos % len(string) + 1
             matchlist = []
             while pos < endpos:
-                result = pattern.exec(string, pos)
+                result = tregex_call_safe(pattern.exec, string, pos)
                 if not result.isMatch:
                     break
                 elif self.num_groups == 0:
@@ -338,7 +338,7 @@ def sub(self, repl, string, count=0):
                 repl = _process_escape_sequences(repl)
             progress = True
             while (count == 0 or n < count) and pos <= len(string) and progress:
-                match_result = pattern.exec(string, pos)
+                match_result = tregex_call_safe(pattern.exec, string, pos)
                 if not match_result.isMatch:
                     break
                 n += 1