GR-37243: fix __module__ attribute for functions when not found in globals

Author: cosminbasca

graalpython/com.oracle.graal.python.cext/posix/posix.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

graalpython/com.oracle.graal.python.test/src/tests/test_functions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -249,3 +249,21 @@ def test_function_text_signature_writable():
     def foo(): pass
     foo.__text_signature__ = 'foo()'
     assert foo.__text_signature__ == 'foo()'
+
+
+def test_function_no_module():
+    def wrapper_2(func):
+        ns = {}
+        exec('def fail_func(): raise ValueError("fail")', ns)
+        return ns['fail_func']
+
+    def wrapper_1(func):
+        assert hasattr(func, '__name__')
+        assert hasattr(func, '__module__')
+        assert func.__module__ is None
+        return func
+
+    @wrapper_1
+    @wrapper_2
+    def test_func():
+        pass

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/AbstractFunctionBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -67,6 +67,7 @@
 import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.object.SetDictNode;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
+import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -181,10 +182,15 @@ static Object getModule(VirtualFrame frame, PFunction self, @SuppressWarnings("u
             if (module == PNone.NO_VALUE) {
                 CompilerDirectives.transferToInterpreter();
                 PythonObject globals = self.getGlobals();
-                if (globals instanceof PythonModule) {
-                    module = globals.getAttribute(__NAME__);
-                } else {
-                    module = getItem.execute(frame, globals, __NAME__);
+                // __module__: If module name is in globals, use it. Otherwise, use None.
+                try {
+                    if (globals instanceof PythonModule) {
+                        module = globals.getAttribute(__NAME__);
+                    } else {
+                        module = getItem.execute(frame, globals, __NAME__);
+                    }
+                } catch (PException pe) {
+                    module = PNone.NONE;
                 }
                 writeObject.execute(self, __MODULE__, module);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyConvertOptionalToSizeNode.java

@@ -52,8 +52,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
- * Equivalent of CPython's {@code _Py_convert_optional_to_ssize_t} function.
- * If value is {@code None}, {@code defaultValue} is returned.
+ * Equivalent of CPython's {@code _Py_convert_optional_to_ssize_t} function. If value is
+ * {@code None}, {@code defaultValue} is returned.
  */
 @GenerateUncached
 public abstract class PyConvertOptionalToSizeNode extends PNodeWithContext {