functions qualified names calculation is not from Scope anymore

Author: Michal Medvecky

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_funcattrs.txt

@@ -14,6 +14,7 @@ test.test_funcattrs.FunctionPropertiesTest.test___closure__ @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test___code__ @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test___globals__ @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test___name__ @ linux-x86_64
+test.test_funcattrs.FunctionPropertiesTest.test___qualname__ @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test_blank_func_defaults @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test_cell_new @ linux-x86_64
 test.test_funcattrs.FunctionPropertiesTest.test_copying___code__ @ linux-x86_64

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_inspect.txt

@@ -92,16 +92,19 @@ test.test_inspect.test_inspect.TestGetattrStatic.test_no_dict_no_slots @ linux-x
 test.test_inspect.test_inspect.TestGetattrStatic.test_no_dict_no_slots_instance_member @ linux-x86_64
 test.test_inspect.test_inspect.TestGetattrStatic.test_property @ linux-x86_64
 test.test_inspect.test_inspect.TestGetattrStatic.test_slots @ linux-x86_64
+test.test_inspect.test_inspect.TestGetcallargsFunctions.test_keyword_only @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsFunctions.test_multiple_features @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsFunctions.test_plain @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsFunctions.test_varargs @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsFunctions.test_varkw @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsFunctions.test_varkw_only @ linux-x86_64
+test.test_inspect.test_inspect.TestGetcallargsMethods.test_keyword_only @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsMethods.test_multiple_features @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsMethods.test_plain @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsMethods.test_varargs @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsMethods.test_varkw @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsMethods.test_varkw_only @ linux-x86_64
+test.test_inspect.test_inspect.TestGetcallargsUnboundMethods.test_keyword_only @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsUnboundMethods.test_multiple_features @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsUnboundMethods.test_plain @ linux-x86_64
 test.test_inspect.test_inspect.TestGetcallargsUnboundMethods.test_varargs @ linux-x86_64

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_reprlib.txt

@@ -9,6 +9,7 @@ test.test_reprlib.ReprTests.test_container @ linux-x86_64
 test.test_reprlib.ReprTests.test_descriptors @ linux-x86_64
 test.test_reprlib.ReprTests.test_frozenset @ linux-x86_64
 test.test_reprlib.ReprTests.test_instance @ linux-x86_64
+test.test_reprlib.ReprTests.test_lambda @ linux-x86_64
 test.test_reprlib.ReprTests.test_nesting @ linux-x86_64
 test.test_reprlib.ReprTests.test_numbers @ linux-x86_64
 test.test_reprlib.ReprTests.test_range @ linux-x86_64

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -40,7 +40,9 @@
  */
 package com.oracle.graal.python.compiler.bytecode_dsl;
 
+import static com.oracle.graal.python.compiler.CompilationScope.AsyncFunction;
 import static com.oracle.graal.python.compiler.CompilationScope.Class;
+import static com.oracle.graal.python.compiler.CompilationScope.TypeParams;
 import static com.oracle.graal.python.compiler.SSTUtils.checkCaller;
 import static com.oracle.graal.python.compiler.SSTUtils.checkCompare;
 import static com.oracle.graal.python.compiler.SSTUtils.checkForbiddenArgs;
@@ -99,6 +101,7 @@
 import com.oracle.graal.python.pegparser.ParserCallbacks.WarningType;
 import com.oracle.graal.python.pegparser.scope.Scope;
 import com.oracle.graal.python.pegparser.scope.Scope.DefUse;
+import com.oracle.graal.python.pegparser.scope.ScopeEnvironment;
 import com.oracle.graal.python.pegparser.sst.AliasTy;
 import com.oracle.graal.python.pegparser.sst.ArgTy;
 import com.oracle.graal.python.pegparser.sst.ArgumentsTy;
@@ -187,6 +190,9 @@ public final class RootNodeCompiler implements BaseBytecodeDSLVisitor<BytecodeDS
      * {@link com.oracle.graal.python.pegparser.scope.ScopeEnvironment#maybeMangle(String, Scope, String)}.
      */
     private final String privateName;
+    private final RootNodeCompiler parent;
+    private final boolean isRoot;
+    private String qualName;
 
     // Immutable after construction
     private final HashMap<String, Integer> varnames;
@@ -215,6 +221,12 @@ public RootNodeCompiler(BytecodeDSLCompilerContext ctx, RootNodeCompiler parent,
         this.startNode = rootNode;
         this.scope = ctx.scopeEnvironment.lookupScope(scopeKey);
         this.scopeType = getScopeType(scope, scopeKey);
+        if (parent == null) {
+            this.isRoot = true;
+        } else {
+            this.isRoot = false;
+        }
+        this.parent = parent;
         if (privateName != null) {
             this.privateName = privateName;
         } else if (scopeType == Class) {
@@ -319,6 +331,29 @@ private static TruffleString[] orderedTruffleStringArray(HashMap<String, Integer
         return orderedKeys(map, new TruffleString[0], PythonUtils::toTruffleStringUncached);
     }
 
+    private String getNewScopeQualName(String name, CompilationScope scopeType) {
+        RootNodeCompiler parent = this.parent;
+        if (parent != null && !parent.isRoot) {
+            if (parent.scopeType == TypeParams && parent.parent != null && !parent.parent.isRoot) {
+                parent = parent.parent;
+                if (parent.parent.parent != null && parent.parent.parent.isRoot) {
+                    return name;
+                }
+            }
+            if (!(EnumSet.of(CompilationScope.Function, AsyncFunction, Class).contains(scopeType) &&
+                    parent.scope.getUseOfName(ScopeEnvironment.mangle(parent.privateName, name)).contains(Scope.DefUse.GlobalExplicit))) {
+                String base;
+                if (EnumSet.of(CompilationScope.Function, AsyncFunction, CompilationScope.Lambda).contains(parent.scopeType)) {
+                    base = parent.qualName + ".<locals>";
+                } else {
+                    base = parent.qualName;
+                }
+                return base + "." + name;
+            }
+        }
+        return name;
+    }
+
     private BytecodeDSLCompilerResult compileRootNode(String name, ArgumentInfo argumentInfo, SourceRange sourceRange, BytecodeParser<Builder> parser) {
         BytecodeRootNodes<PBytecodeDSLRootNode> nodes = PBytecodeDSLRootNodeGen.create(ctx.language, BytecodeConfig.WITH_SOURCE, parser);
         List<PBytecodeDSLRootNode> nodeList = nodes.getNodes();
@@ -358,7 +393,9 @@ private BytecodeDSLCompilerResult compileRootNode(String name, ArgumentInfo argu
             }
         }
 
-        BytecodeDSLCodeUnit codeUnit = new BytecodeDSLCodeUnit(toTruffleStringUncached(name), toTruffleStringUncached(ctx.getQualifiedName(name, scope)),
+        qualName = getNewScopeQualName(name, scopeType);
+
+        BytecodeDSLCodeUnit codeUnit = new BytecodeDSLCodeUnit(toTruffleStringUncached(name), toTruffleStringUncached(qualName),
                         argumentInfo.argCount, argumentInfo.kwOnlyArgCount, argumentInfo.positionalOnlyArgCount,
                         flags, orderedTruffleStringArray(names),
                         orderedTruffleStringArray(varnames),
@@ -3672,7 +3709,7 @@ private void emitMakeFunction(BytecodeDSLCodeUnit codeUnit, Object scopeKey, Str
                         ArgumentsTy argsForDefaults, List<ParamAnnotation> annotations) {
             TruffleString functionName = toTruffleStringUncached(name);
             Scope targetScope = ctx.scopeEnvironment.lookupScope(scopeKey);
-            TruffleString qualifiedName = toTruffleStringUncached(ctx.getQualifiedName(name, targetScope));
+            TruffleString qualifiedName = codeUnit.qualname;
 
             // Register these in the Python constants list.
             addConstant(qualifiedName);