Fix stacksize reporting

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -269,6 +269,10 @@ private static TruffleString extractName(RootNode rootNode) {
 
     @TruffleBoundary
     private static int extractStackSize(RootNode rootNode) {
+        if (rootNode instanceof PBytecodeRootNode) {
+            CodeUnit code = ((PBytecodeRootNode) rootNode).getCodeUnit();
+            return code.stacksize + code.varnames.length + code.cellvars.length + code.freevars.length;
+        }
         return rootNode.getFrameDescriptor().getNumberOfSlots();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CodeUnit.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.compiler;
 
+import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -53,8 +55,6 @@
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.strings.TruffleString;
 
-import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
-
 /**
  * A context-independent representation of code for bytecode interpreter. Contains the actual
  * bytecode and all the related data, like constants or exception handler ranges. It doesn't contain
@@ -111,7 +111,7 @@ public CodeUnit(TruffleString name, TruffleString qualname,
         this.argCount = argCount;
         this.kwOnlyArgCount = kwOnlyArgCount;
         this.positionalOnlyArgCount = positionalOnlyArgCount;
-        this.stacksize = stacksize + varnames.length + cellvars.length + freevars.length;
+        this.stacksize = stacksize;
         this.code = code;
         this.srcOffsetTable = linetable;
         this.flags = flags;