Deprecate WithTRegex and TRegexUsesSREFallback options

Author: djoooooe

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

@@ -105,7 +105,6 @@
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.IndirectCallData.InteropCallData;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
@@ -160,8 +159,6 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
 
     @Override
     public void initialize(Python3Core core) {
-        addBuiltinConstant("_with_tregex", core.getContext().getLanguage().getEngineOption(PythonOptions.WithTRegex));
-        addBuiltinConstant("_with_sre", core.getContext().getLanguage().getEngineOption(PythonOptions.TRegexUsesSREFallback));
         addBuiltinConstant("_METHOD_SEARCH", PythonMethod.Search);
         addBuiltinConstant("_METHOD_MATCH", PythonMethod.Match);
         addBuiltinConstant("_METHOD_FULLMATCH", PythonMethod.FullMatch);
@@ -524,7 +521,7 @@ static TRegexCache getTRegexCache(Node inliningTarget, PythonObject pattern, Hid
 
     @GenerateCached
     @ImportStatic(PythonMethod.class)
-    @SuppressWarnings("truffle-inlining") // TODO
+    @SuppressWarnings("truffle-inlining")
     abstract static class TRegexCompileInner extends PNodeWithContext {
 
         private static final TruffleString T__GETLOCALE = tsLiteral("_getlocale");
@@ -949,8 +946,8 @@ static Object doCached(VirtualFrame frame, PythonObject pattern, Object input, i
             Object compiledRegex = tRegexCompile.execute(frame, tRegexCache, PythonMethod.Search, false);
             Object compiledRegexMustAdvance = tRegexCompile.execute(frame, tRegexCache, PythonMethod.Search, true);
             if (compiledRegex == PNone.NONE || compiledRegexMustAdvance == PNone.NONE) {
-                // TODO: Fallback
-                throw CompilerDirectives.shouldNotReachHere();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw CompilerDirectives.shouldNotReachHere("unsupported regular expression: /" + tRegexCache.pattern + "/" + tRegexCache.flags);
             }
             checkInputTypeNode.execute(frame, input, tRegexCache.binary);
             int groupCount = TRegexUtil.TRegexCompiledRegexAccessor.groupCount(compiledRegex, inliningTarget, readGroupCountNode);
@@ -1134,8 +1131,8 @@ private static Object doSubn(VirtualFrame frame, PythonObject pattern, Object re
             Object compiledRegex = tRegexCompile.execute(frame, tRegexCache, PythonMethod.Search, false);
             Object compiledRegexMustAdvance = tRegexCompile.execute(frame, tRegexCache, PythonMethod.Search, true);
             if (compiledRegex == PNone.NONE || compiledRegexMustAdvance == PNone.NONE) {
-                // TODO: Fallback
-                throw CompilerDirectives.shouldNotReachHere();
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw CompilerDirectives.shouldNotReachHere("unsupported regular expression: /" + tRegexCache.pattern + "/" + tRegexCache.flags);
             }
             checkInputTypeNode.execute(frame, input, tRegexCache.binary);
             return innerNode1.execute(inliningTarget, frame, pattern, compiledRegex, compiledRegexMustAdvance, replacement, input, count, tRegexCache.binary,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextHashBuiltins.java

@@ -48,6 +48,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_hash_t;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Void;
+import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING_BINARY;
 
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
@@ -62,7 +63,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.strings.TruffleString;
-import com.oracle.truffle.api.strings.TruffleString.Encoding;
 import com.oracle.truffle.api.strings.TruffleString.HashCodeNode;
 
 public final class PythonCextHashBuiltins {
@@ -118,7 +118,7 @@ static long doI(Object value, long size,
                         @Cached TruffleString.FromByteArrayNode toString,
                         @Cached HashCodeNode hashNode) {
             byte[] array = readNode.readByteArray(value, (int) size);
-            TruffleString string = toString.execute(array, Encoding.US_ASCII, false);
+            TruffleString string = toString.execute(array, TS_ENCODING_BINARY, false);
             return PyObjectHashNode.hash(string, hashNode);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -281,10 +281,10 @@ public static void checkBytecodeDSLEnv() {
 
     // disabling TRegex has an effect on the _sre Python functions that are
     // dynamically created, so we cannot change that option again.
-    @EngineOption @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Use the optimized TRegex engine. Default true") //
+    @EngineOption @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Use the optimized TRegex engine. Default true", deprecated = true, deprecationMessage = "TRegex is now for all regexes, this option is ignored") //
     public static final OptionKey<Boolean> WithTRegex = new OptionKey<>(true);
 
-    @EngineOption @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Use the CPython sre engine as a fallback to the TRegex engine.") //
+    @EngineOption @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Use the CPython sre engine as a fallback to the TRegex engine.", deprecated = true, deprecationMessage = "TRegex is used for all regexes, this option is ignored") //
     public static final OptionKey<Boolean> TRegexUsesSREFallback = new OptionKey<>(true);
 
     @Option(category = OptionCategory.EXPERT, usageSyntax = "true|false", help = "Switch on/off using lazy strings for performance reasons. Default true.") //

graalpython/lib-graalpython/_sre.py

@@ -77,7 +77,7 @@ def _getlocale():
     return '.'.join((lang, encoding))
 
 def _new_compile(p, flags=0):
-    if _with_tregex and isinstance(p, (str, bytes, bytearray, memoryview, array, mmap)):
+    if isinstance(p, (str, bytes, bytearray, memoryview, array, mmap)):
         return _t_compile(p, flags)
     else:
         return _sre_compile(p, flags)
@@ -279,11 +279,7 @@ def __check_input_type(self, input):
             raise TypeError("cannot use a bytes pattern on a string-like object")
 
     def __fallback_compile(self):
-        if self.__compiled_fallback is None:
-            if not _with_sre:
-                raise ValueError("regular expression not supported, no fallback engine present") from None
-            self.__compiled_fallback = _sre_compile(self.pattern, self.__input_flags)
-        return self.__compiled_fallback
+        raise ValueError("regular expression not supported, no fallback engine present") from None
 
     def __repr__(self):
         flags = self.flags