Address review feedback

Author: msimacek

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/compiler/CompilerTests.java

@@ -562,6 +562,11 @@ public void testTupleLiteralNonConstant() {
         doTest("(1, 2, [3])");
     }
 
+    @Test
+    public void testTupleLiteralMixedIntegers() {
+        doTest("(1, 17179869184, 3)");
+    }
+
     @Test
     public void testTupleLiteralExpand() {
         doTest("(1, 2, 3, *a, 5)");

graalpython/com.oracle.graal.python.test/testData/goldenFiles/CompilerTests/testTupleLiteralMixedIntegers.co

@@ -0,0 +1,3 @@
+Disassembly of <module>:
+000000         0 LOAD_CONST_COLLECTION             0    ([1, 17179869184, 3] type long into tuple)
+000000         3 RETURN_VALUE

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -59,7 +59,7 @@
 import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.compiler.CompilationUnit;
 import com.oracle.graal.python.compiler.Compiler;
-import com.oracle.graal.python.compiler.ErrorCallbackImpl;
+import com.oracle.graal.python.compiler.RaisePythonExceptionErrorCallback;
 import com.oracle.graal.python.nodes.HiddenAttributes;
 import com.oracle.graal.python.nodes.PRootNode;
 import com.oracle.graal.python.nodes.RootNodeFactory;
@@ -499,7 +499,7 @@ private CallTarget parseForBytecodeInterpreter(ParsingRequest request) {
     }
 
     public RootCallTarget parseForBytecodeInterpreter(PythonContext context, Source source, InputType type, boolean topLevel, int optimize, boolean interactiveTerminal) {
-        ErrorCallbackImpl errorCb = new ErrorCallbackImpl(source, PythonOptions.isPExceptionWithJavaStacktrace(this));
+        RaisePythonExceptionErrorCallback errorCb = new RaisePythonExceptionErrorCallback(source, PythonOptions.isPExceptionWithJavaStacktrace(this));
         try {
             Parser parser = Compiler.createParser(source.getCharacters().toString(), errorCb, type, interactiveTerminal);
             Compiler compiler = new Compiler(errorCb);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/ErrorCallbackImpl.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/RaisePythonExceptionErrorCallback.java

@@ -68,15 +68,15 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.strings.TruffleString;
 
-public class ErrorCallbackImpl implements ErrorCallback {
+public class RaisePythonExceptionErrorCallback implements ErrorCallback {
 
     private static final TruffleString DEFAULT_FILENAME = tsLiteral("<string>");
 
     private final Source source;
     private final boolean withJavaStackTrace;
     private List<DeprecationWarning> deprecationWarnings;
 
-    public ErrorCallbackImpl(Source source, boolean withJavaStackTrace) {
+    public RaisePythonExceptionErrorCallback(Source source, boolean withJavaStackTrace) {
         this.source = source;
         this.withJavaStackTrace = withJavaStackTrace;
     }
@@ -198,9 +198,9 @@ public void triggerDeprecationWarnings() {
 
     @TruffleBoundary
     private void triggerDeprecationWarningsBoundary() {
+        PythonModule warnings = PythonContext.get(null).lookupBuiltinModule(T__WARNINGS);
         for (DeprecationWarning warning : deprecationWarnings) {
             try {
-                PythonModule warnings = PythonContext.get(null).lookupBuiltinModule(T__WARNINGS);
                 PyObjectCallMethodObjArgs.getUncached().execute(null, warnings, WarningsModuleBuiltins.T_WARN_EXPLICIT, //
                                 warning.message, PythonBuiltinClassType.DeprecationWarning, getFilename(), warning.sourceRange.startLine);
             } catch (PException e) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -89,12 +89,12 @@
 import com.oracle.graal.python.builtins.objects.slice.SliceNodesFactory.CreateSliceNodeGen;
 import com.oracle.graal.python.compiler.BinaryOpsConstants;
 import com.oracle.graal.python.compiler.CodeUnit;
-import com.oracle.graal.python.compiler.ErrorCallbackImpl;
 import com.oracle.graal.python.compiler.FormatOptions;
 import com.oracle.graal.python.compiler.OpCodes;
 import com.oracle.graal.python.compiler.OpCodes.CollectionBits;
 import com.oracle.graal.python.compiler.OpCodesConstants;
 import com.oracle.graal.python.compiler.QuickeningTypes;
+import com.oracle.graal.python.compiler.RaisePythonExceptionErrorCallback;
 import com.oracle.graal.python.compiler.UnaryOpsConstants;
 import com.oracle.graal.python.lib.PyObjectAsciiNode;
 import com.oracle.graal.python.lib.PyObjectAsciiNodeGen;
@@ -437,7 +437,8 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
     private final CodeUnit co;
     private final Source source;
     private SourceSection sourceSection;
-    private final ErrorCallbackImpl parserErrorCallback; // For deferred deprecation warnings
+    // For deferred deprecation warnings
+    private final RaisePythonExceptionErrorCallback parserErrorCallback;
 
     @CompilationFinal(dimensions = 1) final byte[] bytecode;
     @CompilationFinal(dimensions = 1) private final Object[] consts;
@@ -541,12 +542,12 @@ private static Signature makeSignature(CodeUnit co) {
     }
 
     @TruffleBoundary
-    public PBytecodeRootNode(TruffleLanguage<?> language, CodeUnit co, Source source, ErrorCallbackImpl parserErrorCallback) {
+    public PBytecodeRootNode(TruffleLanguage<?> language, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
         this(language, makeFrameDescriptor(co), makeSignature(co), co, source, parserErrorCallback);
     }
 
     @TruffleBoundary
-    public PBytecodeRootNode(TruffleLanguage<?> language, FrameDescriptor fd, Signature sign, CodeUnit co, Source source, ErrorCallbackImpl parserErrorCallback) {
+    public PBytecodeRootNode(TruffleLanguage<?> language, FrameDescriptor fd, Signature sign, CodeUnit co, Source source, RaisePythonExceptionErrorCallback parserErrorCallback) {
         super(language, fd);
         ((FrameInfo) fd.getInfo()).rootNode = this;
         this.celloffset = co.varnames.length;