Bytecode DSL: fix remaining tests in test_code

Author: steve-s

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

@@ -1,3 +1,4 @@
+DocTestCase.test.test_code @ linux-x86_64
 test.test_code.CodeTest.test_code_hash_uses_bytecode @ linux-x86_64
 test.test_code.CodeTest.test_constructor @ linux-x86_64
 test.test_code.CodeTest.test_qualname @ linux-x86_64

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

@@ -709,6 +709,11 @@ String maybeMangle(String name) {
         return ctx.maybeMangle(this.privateName, scope, name);
     }
 
+    String maybeMangleAndAddName(String name) {
+        String mangled = ctx.maybeMangle(this.privateName, scope, name);
+        return addName(mangled);
+    }
+
     // --------------------- visitor ---------------------------
 
     @Override
@@ -1284,10 +1289,9 @@ private String mangle(String name) {
         return ctx.mangle(scope, name);
     }
 
-    private void emitNotImplemented(String what, Builder b) {
-        b.beginRaiseNotImplementedError();
-        emitPythonConstant(toTruffleStringUncached(what), b);
-        b.endRaiseNotImplementedError();
+    private String mangleAndAddName(String name) {
+        String mangled = ctx.mangle(scope, name);
+        return addName(mangled);
     }
 
     /**
@@ -1335,12 +1339,12 @@ private void emitYield(Consumer<StatementCompiler> yieldValueProducer, Statement
     }
 
     private void beginSetAttribute(String name, Builder b) {
-        String mangled = maybeMangle(name);
+        String mangled = maybeMangleAndAddName(name);
         b.beginSetAttribute(toTruffleStringUncached(mangled));
     }
 
     private void beginGetAttribute(String name, Builder b) {
-        String mangled = maybeMangle(name);
+        String mangled = maybeMangleAndAddName(name);
         b.beginGetAttribute(toTruffleStringUncached(mangled));
     }
 
@@ -1423,7 +1427,7 @@ private void emitNameFastOperation(String mangled, NameOperation op, Builder b)
 
     private void emitNameGlobalOperation(String name, NameOperation op, Builder b, boolean isImplicitScope) {
         assert locals.get(name) == null;
-        names.putIfAbsent(name, names.size());
+        addName(name);
         TruffleString tsName = toTruffleStringUncached(name);
         switch (op) {
             case Read:
@@ -1456,9 +1460,14 @@ private void emitNameGlobalOperation(String name, NameOperation op, Builder b, b
         }
     }
 
+    private String addName(String name) {
+        names.putIfAbsent(name, names.size());
+        return name;
+    }
+
     private void emitNameSlowOperation(String name, NameOperation op, Builder b) {
         assert locals.get(name) == null;
-        names.putIfAbsent(name, names.size());
+        addName(name);
         TruffleString tsName = toTruffleStringUncached(name);
         switch (op) {
             case Read:
@@ -3579,7 +3588,7 @@ public Void visit(ExprTy.Subscript node) {
             @Override
             public Void visit(ExprTy.Attribute node) {
                 boolean newStatement = beginSourceSection(node, b);
-                b.beginDeleteAttribute(toTruffleStringUncached(maybeMangle(node.attr)));
+                b.beginDeleteAttribute(toTruffleStringUncached(maybeMangleAndAddName(node.attr)));
                 node.value.accept(StatementCompiler.this);
                 b.endDeleteAttribute();
 
@@ -3649,7 +3658,7 @@ public Void visit(StmtTy.Expr node) {
                 b.beginPrintExpr();
                 node.value.accept(this);
                 b.endPrintExpr();
-            } else {
+            } else if (!(node.value instanceof ExprTy.Constant)) {
                 node.value.accept(this);
             }
             endSourceSection(b, newStatement);
@@ -3910,7 +3919,6 @@ private void emitMakeFunction(BytecodeDSLCodeUnit codeUnit, Object scopeKey, Str
             TruffleString qualifiedName = codeUnit.qualname;
 
             // Register these in the Python constants list.
-            addConstant(qualifiedName);
             addConstant(codeUnit);
 
             b.beginMakeFunction(functionName, qualifiedName, new BytecodeDSLCodeUnitAndRoot(codeUnit));
@@ -4083,7 +4091,8 @@ public Void visit(StmtTy.ImportFrom node) {
                 ctx.errorCallback.onError(ErrorType.Syntax, node.getSourceRange(), "from __future__ imports must occur at the beginning of the file");
             }
 
-            TruffleString tsModuleName = toTruffleStringUncached(node.module == null ? "" : node.module);
+            String moduleName = addName(node.module == null ? "" : node.module);
+            TruffleString tsModuleName = toTruffleStringUncached(moduleName);
 
             if (node.names[0].name.equals("*")) {
                 b.emitImportStar(tsModuleName, node.level);
@@ -4104,6 +4113,7 @@ public Void visit(StmtTy.ImportFrom node) {
                 TruffleString[] importedNames = new TruffleString[node.names.length];
                 for (int i = 0; i < node.names.length; i++) {
                     AliasTy alias = node.names[i];
+                    addName(alias.name);
                     String asName = alias.asName == null ? alias.name : alias.asName;
                     beginStoreLocal(asName, b);