Fix argument validation in sys.intern

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

@@ -46,3 +46,4 @@
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_err
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_wrong_type
+*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_intern

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

@@ -42,6 +42,7 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
+import static com.oracle.graal.python.nodes.PGuards.cannotBeOverridden;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SIZEOF__;
 
 import java.io.IOException;
@@ -69,6 +70,7 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.str.StringNodes.StringMaterializeNode;
 import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;
 import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
@@ -97,6 +99,7 @@
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+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;
@@ -415,15 +418,24 @@ protected String getFileSystemEncoding() {
     abstract static class InternNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
-        String doBytes(String s) {
+        String doString(String s) {
             return s.intern();
         }
 
-        @Specialization
-        @TruffleBoundary
-        PString doBytes(PString ps) {
-            String s = ps.getValue();
-            return factory().createString(s.intern());
+        @Specialization(limit = "1")
+        String doPString(PString ps,
+                        @CachedLibrary("ps") PythonObjectLibrary lib,
+                        @Cached StringMaterializeNode materializeNode) {
+            if (cannotBeOverridden(lib.getLazyPythonClass(ps))) {
+                return doString(materializeNode.execute(ps));
+            } else {
+                throw raise(TypeError, ErrorMessages.CANNOT_INTERN_P, ps);
+            }
+        }
+
+        @Fallback
+        String doOthers(Object obj) {
+            throw raise(TypeError, ErrorMessages.ARG_MUST_BE_S_NOT_P, "intern()", "str", obj);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -576,4 +576,5 @@ public abstract class ErrorMessages {
     public static final String KEYS_IN_TRANSLATE_TABLE_MUST_BE_STRINGS_OR_INTEGERS = "keys in translate table must be strings or integers";
     public static final String EXPECTED_BYTES_P_FOUND = "expected bytes, %p found";
     public static final String EMBEDDED_NULL_BYTE = "embedded null byte";
+    public static final String CANNOT_INTERN_P = "can't intern %p";
 }

graalpython/lib-python/3/test/test_sys.py

@@ -533,6 +533,10 @@ def test_intern(self):
         INTERN_NUMRUNS += 1
         self.assertRaises(TypeError, sys.intern)
         s = "never interned before" + str(INTERN_NUMRUNS)
+        # GraalPython patch: added the following line
+        # The docs does not seem to indicate that 'sys.intern(s) is s'
+        # should hold in general unless 's' was already an interned string
+        s = sys.intern(s)
         self.assertTrue(sys.intern(s) is s)
         s2 = s.swapcase().swapcase()
         self.assertTrue(sys.intern(s2) is s)