don't catch Throwable all over the place, just Exception

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

@@ -92,7 +92,7 @@ public Object execute(VirtualFrame frame) {
             result = run(frame);
         } catch (PException e) {
             printExc(e);
-        } catch (Throwable e) {
+        } catch (Exception e) {
             if (PythonOptions.getOption(context, PythonOptions.WithJavaStacktrace)) {
                 boolean exitException = e instanceof TruffleException && ((TruffleException) e).isExit();
                 if (!exitException) {
@@ -184,7 +184,7 @@ private void handleSystemExit(PException e) {
     }
 
     @TruffleBoundary
-    private static void printStackTrace(Throwable e) {
+    private static void printStackTrace(Exception e) {
         e.printStackTrace();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java

@@ -64,7 +64,7 @@ public Object execute(VirtualFrame frame) {
             } catch (PException e) {
                 // Python exceptions just fall through
                 throw e;
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 // catch any other exception and convert to Python exception
                 throw assertionFailed(frame);
             }
@@ -86,7 +86,7 @@ private PException assertionFailed(VirtualFrame frame) {
             } catch (PException e) {
                 // again, Python exceptions just fall through
                 throw e;
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 assertionMessage = "internal exception occurred";
             }
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java

@@ -92,7 +92,7 @@ public Object execute(VirtualFrame frame) {
     }
 
     @TruffleBoundary
-    private PBaseException getBaseException(Throwable t) {
+    private PBaseException getBaseException(Exception t) {
         return factory().createBaseException(getCore().getErrorClass(PythonErrorType.ValueError), t.getMessage(), new Object[0]);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonErrorStrategy.java

@@ -55,7 +55,7 @@ public void recover(Parser recognizer, RecognitionException e) {
         super.recover(recognizer, e);
     }
 
-    static int getLine(Throwable e) {
+    static int getLine(Exception e) {
         if (e instanceof RecognitionException) {
             return ((RecognitionException) e).getOffendingToken().getLine();
         } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonInlineTreeTranslator.java

@@ -62,7 +62,7 @@ public PythonInlineTreeTranslator(PythonCore core, String name, ParserRuleContex
             }
         } catch (PException e) {
             throw e;
-        } catch (Throwable t) {
+        } catch (Exception t) {
             t.printStackTrace();
             throw new RuntimeException("Failed in " + this + " with error " + t, t);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java

@@ -87,11 +87,11 @@ private static ParserRuleContext preParseWithAntlr(PythonCore core, Source sourc
                 } else {
                     input = parser.file_input();
                 }
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 try {
                     parser.reset();
                     input = parser.eval_input();
-                } catch (Throwable e2) {
+                } catch (Exception e2) {
                     if (source.isInteractive() && e instanceof PIncompleteSourceException) {
                         ((PIncompleteSourceException) e).setSource(source);
                         throw e;
@@ -110,11 +110,11 @@ private static ParserRuleContext preParseInlineWithAntlr(PythonCore core, Source
         ParserRuleContext input;
         try {
             input = parser.single_input();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             try {
                 parser.reset();
                 input = parser.eval_input();
-            } catch (Throwable e2) {
+            } catch (Exception e2) {
                 Node location = getLocation(source, PythonErrorStrategy.getLine(e));
                 throw core.raise(SyntaxError, location, e.getMessage());
             }
@@ -155,7 +155,7 @@ public PythonParseResult parseEval(PythonCore core, String expression, String fi
         ParserRuleContext input;
         try {
             input = parser.eval_input();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             throw handleParserError(core, e);
         }
         Source source = Source.newBuilder(expression).name(filename).mimeType(PythonLanguage.MIME_TYPE).build();
@@ -170,7 +170,7 @@ public PythonParseResult parseExec(PythonCore core, String expression, String fi
         ParserRuleContext input;
         try {
             input = parser.file_input();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             throw handleParserError(core, e);
         }
         Source source = Source.newBuilder(expression).name(filename).mimeType(PythonLanguage.MIME_TYPE).build();
@@ -184,7 +184,7 @@ public PythonParseResult parseSingle(PythonCore core, String expression, String
         ParserRuleContext input;
         try {
             input = parser.single_input();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             throw handleParserError(core, e);
         }
         Source source = Source.newBuilder(expression).name(filename).mimeType(PythonLanguage.MIME_TYPE).build();
@@ -198,13 +198,13 @@ public boolean isIdentifier(PythonCore core, String snippet) {
         Python3Parser.AtomContext input;
         try {
             input = parser.atom();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             return false;
         }
         return input.NAME() != null;
     }
 
-    private static PException handleParserError(PythonCore core, Throwable e) {
+    private static PException handleParserError(PythonCore core, Exception e) {
         return core.raise(SyntaxError, e.getMessage());
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java

@@ -63,7 +63,7 @@ public PythonTreeTranslator(PythonCore core, String name, ParserRuleContext inpu
             }
         } catch (PException e) {
             throw e;
-        } catch (Throwable t) {
+        } catch (Exception t) {
             t.printStackTrace();
             throw new RuntimeException("Failed in " + this + " with error " + t, t);
         }