Add PyUnicode_Contains

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -665,3 +665,8 @@ UPCALL_ID(PyUnicode_ReadChar);
 Py_UCS4 PyUnicode_ReadChar(PyObject *unicode, Py_ssize_t index) {
 	return UPCALL_CEXT_I(_jls_PyUnicode_ReadChar, native_to_java(unicode), index);
 }
+
+UPCALL_ID(PyUnicode_Contains)
+int PyUnicode_Contains(PyObject *str, PyObject *substr) {
+    return UPCALL_CEXT_I(_jls_PyUnicode_Contains, native_to_java(str), native_to_java(substr));
+}

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

@@ -226,6 +226,7 @@
 import com.oracle.graal.python.builtins.objects.set.PSet;
 import com.oracle.graal.python.builtins.objects.str.NativeCharSequence;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.str.StringBuiltins;
 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;
@@ -1634,6 +1635,22 @@ PString run(PString str) {
         }
     }
 
+    @Builtin(name = "PyUnicode_Contains", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    abstract static class PyUnicodeContains extends PythonBinaryBuiltinNode {
+        @Specialization
+        int contains(VirtualFrame frame, Object haystack, Object needle,
+                        @Cached StringBuiltins.ContainsNode containsNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            try {
+                return containsNode.executeBool(haystack, needle) ? 1 : 0;
+            } catch (PException e) {
+                transformExceptionToNativeNode.execute(frame, e);
+                return -1;
+            }
+        }
+    }
+
     @Builtin(name = "do_richcompare", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class RichCompareNode extends PythonTernaryBuiltinNode {

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

@@ -391,7 +391,9 @@ boolean operator(String self, String other) {
 
     @Builtin(name = __CONTAINS__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    abstract static class ContainsNode extends PythonBinaryBuiltinNode {
+    public abstract static class ContainsNode extends PythonBinaryBuiltinNode {
+        public abstract boolean executeBool(Object self, Object left);
+
         @Specialization
         boolean doit(Object self, Object other,
                         @Cached CastToJavaStringNode castStr) {