Rename these functions

src/codegen/ast_interpreter.cpp

@@ -333,7 +333,7 @@ Box* ASTInterpreter::execJITedBlock(CFGBlock* b) {
 
         auto source = getCL()->source.get();
         stmt->cxx_exception_count++;
-        exceptionCaughtInInterpreter(LineInfo(stmt->lineno, stmt->col_offset, source->fn, source->getName()), &e);
+        caughtCxxException(LineInfo(stmt->lineno, stmt->col_offset, source->fn, source->getName()), &e);
 
         next_block = ((AST_Invoke*)stmt)->exc_dest;
         last_exception = e;
@@ -773,7 +773,7 @@ Value ASTInterpreter::visit_invoke(AST_Invoke* node) {
 
         auto source = getCL()->source.get();
         node->cxx_exception_count++;
-        exceptionCaughtInInterpreter(LineInfo(node->lineno, node->col_offset, source->fn, source->getName()), &e);
+        caughtCxxException(LineInfo(node->lineno, node->col_offset, source->fn, source->getName()), &e);
 
         next_block = node->exc_dest;
         last_exception = e;

src/codegen/irgen/hooks.h

@@ -39,10 +39,6 @@ void compileAndRunModule(AST_Module* m, BoxedModule* bm);
 // will we always want to generate unique function names? (ie will this function always be reasonable?)
 CompiledFunction* cfForMachineFunctionName(const std::string&);
 
-extern "C" void capiExcCaughtInJit(AST_stmt* current_stmt, void* source_info);
-// This is just meant for the use of the JIT (normal runtime code should call throwCAPIException)
-extern "C" void reraiseJitCapiExc() __attribute__((noreturn));
-
 extern "C" Box* exec(Box* boxedCode, Box* globals, Box* locals, FutureFlags caller_future_flags);
 extern "C" Box* eval(Box* boxedCode, Box* globals, Box* locals);
 extern "C" Box* compile(Box* source, Box* filename, Box* mode, Box** _args /* flags, dont_inherit */);

src/codegen/irgen/irgenerator.cpp

@@ -2805,14 +2805,14 @@ public:
         capi_current_statements[final_dest] = current_stmt;
 
         emitter.setCurrentBasicBlock(capi_exc_dest);
-        emitter.getBuilder()->CreateCall2(g.funcs.capiExcCaughtInJit,
+        emitter.getBuilder()->CreateCall2(g.funcs.caughtCapiException,
                                           embedRelocatablePtr(current_stmt, g.llvm_aststmt_type_ptr),
                                           embedRelocatablePtr(irstate->getSourceInfo(), g.i8_ptr));
 
         if (!final_dest) {
             // Propagate the exception out of the function:
             if (irstate->getExceptionStyle() == CXX) {
-                emitter.getBuilder()->CreateCall(g.funcs.reraiseJitCapiExc);
+                emitter.getBuilder()->CreateCall(g.funcs.reraiseCapiExcAsCxx);
                 emitter.getBuilder()->CreateUnreachable();
             } else {
                 emitter.getBuilder()->CreateRet(getNullPtr(g.llvm_value_type_ptr));

src/codegen/runtime_hooks.cpp

@@ -312,8 +312,8 @@ void initGlobalFuncs(GlobalState& g) {
     GET(PyErr_Fetch);
     GET(PyErr_NormalizeException);
     GET(PyErr_Restore);
-    GET(capiExcCaughtInJit);
-    GET(reraiseJitCapiExc);
+    GET(caughtCapiException);
+    GET(reraiseCapiExcAsCxx);
     GET(deopt);
 
     GET(div_float_float);

src/codegen/runtime_hooks.h

@@ -51,7 +51,7 @@ struct GlobalFuncs {
 
     llvm::Value* __cxa_end_catch;
     llvm::Value* raise0, *raise3, *raise3_capi;
-    llvm::Value* PyErr_Fetch, *PyErr_NormalizeException, *PyErr_Restore, *capiExcCaughtInJit, *reraiseJitCapiExc;
+    llvm::Value* PyErr_Fetch, *PyErr_NormalizeException, *PyErr_Restore, *caughtCapiException, *reraiseCapiExcAsCxx;
     llvm::Value* deopt;
 
     llvm::Value* div_float_float, *floordiv_float_float, *mod_float_float, *pow_float_float;

src/codegen/unwinding.h

@@ -53,7 +53,9 @@ void logException(ExcInfo* exc_info);
 void startReraise();
 bool exceptionAtLineCheck();
 void exceptionAtLine(LineInfo line_info, Box** traceback);
-void exceptionCaughtInInterpreter(LineInfo line_info, ExcInfo* exc_info);
+void caughtCxxException(LineInfo line_info, ExcInfo* exc_info);
+extern "C" void caughtCapiException(AST_stmt* current_stmt, void* source_info);
+extern "C" void reraiseCapiExcAsCxx() __attribute__((noreturn));
 
 
 CLFunction* getTopPythonFunction();

src/runtime/exceptions.cpp

@@ -220,14 +220,14 @@ void logException(ExcInfo* exc_info) {
 #endif
 }
 
-extern "C" void capiExcCaughtInJit(AST_stmt* stmt, void* _source_info) {
+extern "C" void caughtCapiException(AST_stmt* stmt, void* _source_info) {
     SourceInfo* source = static_cast<SourceInfo*>(_source_info);
     PyThreadState* tstate = PyThreadState_GET();
 
     exceptionAtLine(LineInfo(stmt->lineno, stmt->col_offset, source->fn, source->getName()), &tstate->curexc_traceback);
 }
 
-extern "C" void reraiseJitCapiExc() {
+extern "C" void reraiseCapiExcAsCxx() {
     ensureCAPIExceptionSet();
     // TODO: we are normalizing to many times?
     ExcInfo e = excInfoForRaise(cur_thread_state.curexc_type, cur_thread_state.curexc_value,
@@ -237,7 +237,7 @@ extern "C" void reraiseJitCapiExc() {
     throw e;
 }
 
-void exceptionCaughtInInterpreter(LineInfo line_info, ExcInfo* exc_info) {
+void caughtCxxException(LineInfo line_info, ExcInfo* exc_info) {
     static StatCounter frames_unwound("num_frames_unwound_python");
     frames_unwound.log();
 

src/runtime/inline/link_forcer.cpp

@@ -130,8 +130,8 @@ void force() {
     FORCE(PyErr_Fetch);
     FORCE(PyErr_NormalizeException);
     FORCE(PyErr_Restore);
-    FORCE(capiExcCaughtInJit);
-    FORCE(reraiseJitCapiExc);
+    FORCE(caughtCapiException);
+    FORCE(reraiseCapiExcAsCxx);
     FORCE(deopt);
 
     FORCE(div_i64_i64);