fix deprecations

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -554,12 +554,6 @@ protected void printHelp(OptionCategory maxCategory) {
                         "GRAAL_PYTHON_OPTIONS: This environment variable can include default options that\n" +
                         "   are always passed to the launcher. These are not shell expanded and given to\n" +
                         "   the launcher as-is.");
-        if (maxCategory.compareTo(OptionCategory.DEBUG) >= 0) {
-            print("\nGraalPython performance debugging options:\n" +
-                            "-debug-perf                  : Enable tracing of Truffle compilations and its warnings\n" +
-                            "-dump                        : Enable dumping of compilation graphs to IGV\n" +
-                            "-compile-truffle-immediately : Start compiling on first invocation and throw compilation exceptions");
-        }
     }
 
     @Override

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.objects.exception;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -61,6 +60,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -191,8 +191,8 @@ public List<TruffleStackTraceElement> getStackTrace() {
     @TruffleBoundary
     public void reifyException() {
         if (stackTrace == null && traceback == null) {
-            TruffleStackTraceElement.fillIn(exception);
-            stackTrace = new ArrayList<>(TruffleStackTraceElement.getStackTrace(exception));
+            TruffleStackTrace.fillIn(exception);
+            stackTrace = TruffleStackTrace.getStacktrace(exception);
             Iterator<TruffleStackTraceElement> iter = stackTrace.iterator();
             while (iter.hasNext()) {
                 TruffleStackTraceElement element = iter.next();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -84,16 +84,16 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "Equivalent to the Python -v flag. Turn on verbose mode.") //
     public static final OptionKey<Boolean> VerboseFlag = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "Expose internal sources as normal sources, so they will show up in the debugger and stacks") //
+    @Option(category = OptionCategory.INTERNAL, help = "Expose internal sources as normal sources, so they will show up in the debugger and stacks") //
     public static final OptionKey<Boolean> ExposeInternalSources = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "Print the java stacktrace if enabled") //
+    @Option(category = OptionCategory.INTERNAL, help = "Print the java stacktrace if enabled") //
     public static final OptionKey<Boolean> WithJavaStacktrace = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "") //
+    @Option(category = OptionCategory.INTERNAL, help = "") //
     public static final OptionKey<Boolean> CatchGraalPythonExceptionForUnitTesting = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "Enable catching all Exceptions in generic try-catch statements.") //
+    @Option(category = OptionCategory.INTERNAL, help = "Enable catching all Exceptions in generic try-catch statements.") //
     public static final OptionKey<Boolean> CatchAllExceptions = new OptionKey<>(false);
 
     @Option(category = OptionCategory.EXPERT, help = "") //

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ExceptionUtils.java

@@ -44,8 +44,9 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleStackTrace;
+import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -55,7 +56,7 @@ private ExceptionUtils() {
 
     @TruffleBoundary
     public static void printPythonLikeStackTrace(PException e) {
-        List<TruffleStackTraceElement> stackTrace = TruffleStackTraceElement.getStackTrace(e);
+        List<TruffleStackTraceElement> stackTrace = TruffleStackTrace.getStacktrace(e);
         ArrayList<String> stack = new ArrayList<>();
         for (TruffleStackTraceElement frame : stackTrace) {