we get qualified names from names provided rather than scope name

Author: Michal Medvecky

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

@@ -143,8 +143,21 @@ String getQualifiedName(Scope scope) {
             }
         }
 
+        String getQualifiedName(String name, Scope scope) {
+            if (qualifiedNames.containsKey(scope)) {
+                return qualifiedNames.get(scope);
+            } else {
+                String qualifiedName = computeQualifiedName(name, scope);
+                qualifiedNames.put(scope, qualifiedName);
+                return qualifiedName;
+            }
+        }
+
         private String computeQualifiedName(Scope scope) {
-            String qualifiedName = scope.getName();
+            return computeQualifiedName(scope.getName(), scope);
+        }
+
+        private String computeQualifiedName(String qualifiedName, Scope scope) {
             Scope parentScope = scopeEnvironment.lookupParent(scope);
             if (parentScope != null && parentScope != scopeEnvironment.getTopScope()) {
                 if (parentScope.isTypeParam()) {
@@ -153,14 +166,14 @@ private String computeQualifiedName(Scope scope) {
                         return qualifiedName;
                     }
                 }
-                if (!((scope.isFunction() || scope.isClass()) && parentScope.getUseOfName(mangle(scope, scope.getName())).contains(Scope.DefUse.GlobalExplicit))) {
+                if (!((scope.isFunction() || scope.isClass()) && parentScope.getUseOfName(mangle(scope, qualifiedName)).contains(Scope.DefUse.GlobalExplicit))) {
                     // Qualify the name, unless it's a function/class and the parent declared the
                     // name as a global (in which case the function/class doesn't belong to the
                     // parent).
                     if (parentScope.isFunction()) {
-                        qualifiedName = getQualifiedName(parentScope) + ".<locals>." + scope.getName();
+                        qualifiedName = getQualifiedName(parentScope) + ".<locals>." + qualifiedName;
                     } else {
-                        qualifiedName = getQualifiedName(parentScope) + "." + scope.getName();
+                        qualifiedName = getQualifiedName(parentScope) + "." + qualifiedName;
                     }
                 }
             }

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

@@ -358,7 +358,7 @@ private BytecodeDSLCompilerResult compileRootNode(String name, ArgumentInfo argu
             }
         }
 
-        BytecodeDSLCodeUnit codeUnit = new BytecodeDSLCodeUnit(toTruffleStringUncached(name), toTruffleStringUncached(ctx.getQualifiedName(scope)),
+        BytecodeDSLCodeUnit codeUnit = new BytecodeDSLCodeUnit(toTruffleStringUncached(name), toTruffleStringUncached(ctx.getQualifiedName(name, scope)),
                         argumentInfo.argCount, argumentInfo.kwOnlyArgCount, argumentInfo.positionalOnlyArgCount,
                         flags, orderedTruffleStringArray(names),
                         orderedTruffleStringArray(varnames),
@@ -3672,7 +3672,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(targetScope));
+            TruffleString qualifiedName = toTruffleStringUncached(ctx.getQualifiedName(name, targetScope));
 
             // Register these in the Python constants list.
             addConstant(qualifiedName);