Fix contains behaviour

Adam Hrbac · Adam Hrbac · commit ae41301922a5 · 2022-09-01T15:13:01.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextBuiltins.java
@@ -129,12 +129,13 @@ Object doGetDefault(PContextVarsContext self, Object key, Object def,
     @GenerateNodeFactory
     public abstract static class Contains extends PythonBuiltinNode {
         @Specialization
-        boolean doIn(PContextVarsContext self, Object key) {
+        boolean doIn(PContextVarsContext self, Object key,
+                        @Cached PRaiseNode raise) {
             if (key instanceof PContextVar) {
                 PContextVar var = (PContextVar) key;
                 return self.contextVarValues.lookup(var, var.getHash()) != null;
             }
-            return false;
+            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.CONTEXTVAR_KEY_EXPECTED, key);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,13 @@ Object doGetDefault(PContextVarsContext self, Object key, Object def,`
`129`	`129`	`@GenerateNodeFactory`
`130`	`130`	`public abstract static class Contains extends PythonBuiltinNode {`
`131`	`131`	`@Specialization`
`132`		`- boolean doIn(PContextVarsContext self, Object key) {`
	`132`	`+ boolean doIn(PContextVarsContext self, Object key,`
	`133`	`+ @Cached PRaiseNode raise) {`
`133`	`134`	`if (key instanceof PContextVar) {`
`134`	`135`	`PContextVar var = (PContextVar) key;`
`135`	`136`	`return self.contextVarValues.lookup(var, var.getHash()) != null;`
`136`	`137`	`}`
`137`		`- return false;`
	`138`	`+ throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.CONTEXTVAR_KEY_EXPECTED, key);`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`