Revert "Don't use jl_rethrow_other for LoadError/InitError" (#31963)

This reverts commit d3dbe86.

+ fixup new tests in backtrace.jl

(cherry picked from commit a526662)

Author: c42f

base/errorshow.jl

@@ -85,11 +85,18 @@ function showerror(io::IO, ex, bt; backtrace=true)
 end
 
 function showerror(io::IO, ex::LoadError, bt; backtrace=true)
-    print(io, "Error while loading expression starting at ", ex.file, ":", ex.line)
+    print(io, "LoadError: ")
+    showerror(io, ex.error, bt, backtrace=backtrace)
+    print(io, "\nin expression starting at $(ex.file):$(ex.line)")
 end
 showerror(io::IO, ex::LoadError) = showerror(io, ex, [])
 
-showerror(io::IO, ex::InitError) = print(io, "InitError during initialization of module ", ex.mod)
+function showerror(io::IO, ex::InitError, bt; backtrace=true)
+    print(io, "InitError: ")
+    showerror(io, ex.error, bt, backtrace=backtrace)
+    print(io, "\nduring initialization of module ", ex.mod)
+end
+showerror(io::IO, ex::InitError) = showerror(io, ex, [])
 
 function showerror(io::IO, ex::DomainError)
     if isa(ex.val, AbstractArray)

src/ast.c

@@ -892,8 +892,8 @@ jl_value_t *jl_parse_eval_all(const char *fname,
         if (jl_loaderror_type == NULL)
             jl_rethrow();
         else
-            jl_throw(jl_new_struct(jl_loaderror_type, form, result,
-                                   jl_current_exception()));
+            jl_rethrow_other(jl_new_struct(jl_loaderror_type, form, result,
+                                           jl_current_exception()));
     }
     JL_GC_POP();
     return result;
@@ -1050,8 +1050,8 @@ static jl_value_t *jl_invoke_julia_macro(jl_array_t *args, jl_module_t *inmodule
             else
                 margs[0] = jl_cstr_to_string("<macrocall>");
             margs[1] = jl_fieldref(lno, 0); // extract and allocate line number
-            jl_throw(jl_new_struct(jl_loaderror_type, margs[0], margs[1],
-                                   jl_current_exception()));
+            jl_rethrow_other(jl_new_struct(jl_loaderror_type, margs[0], margs[1],
+                                           jl_current_exception()));
         }
     }
     ptls->world_age = last_age;

src/toplevel.c

@@ -79,8 +79,8 @@ void jl_module_run_initializer(jl_module_t *m)
             jl_rethrow();
         }
         else {
-            jl_throw(jl_new_struct(jl_initerror_type, m->name,
-                                   jl_current_exception()));
+            jl_rethrow_other(jl_new_struct(jl_initerror_type, m->name,
+                                           jl_current_exception()));
         }
     }
 }

test/backtrace.jl

@@ -199,7 +199,7 @@ let trace = try
 
             """, "a_filename")
     catch
-        stacktrace(Base.catch_stack()[end-1][2]) # Ignore LoadError
+        stacktrace(catch_backtrace())
     end
     @test trace[1].func == Symbol("top-level scope")
     @test trace[1].file == :a_filename
@@ -213,7 +213,7 @@ let trace = try
 
             """, "a_filename")
     catch
-        stacktrace(Base.catch_stack()[end-1][2]) # Ignore LoadError
+        stacktrace(catch_backtrace())
     end
     @test trace[1].func == Symbol("top-level scope")
     @test trace[1].file == :a_filename

test/errorshow.jl

@@ -156,16 +156,15 @@ end
 macro except_strbt(expr, err_type)
     errmsg = "expected failure, but no exception thrown for $expr"
     return quote
-        let err = nothing, bt = nothing
+        let err = nothing
             try
                 $(esc(expr))
             catch err
-                bt = catch_backtrace()
             end
             err === nothing && error($errmsg)
             @test typeof(err) === $(esc(err_type))
             buf = IOBuffer()
-            showerror(buf, err, bt)
+            showerror(buf, err, catch_backtrace())
             String(take!(buf))
         end
     end
@@ -555,12 +554,3 @@ let buf = IOBuffer()
     Base.show_method_candidates(buf, Base.MethodError(sin, Tuple{NoMethodsDefinedHere}))
     @test length(take!(buf)) !== 0
 end
-
-@testset "Nested errors" begin
-    # LoadError and InitError used to print the nested exception.
-    # This is now dealt with via the exception stack so these print very simply:
-    @test sprint(Base.showerror, LoadError("somefile.jl", 10, ErrorException("retained for backward compat"))) ==
-          "Error while loading expression starting at somefile.jl:10"
-    @test sprint(Base.showerror, InitError(:some_module, ErrorException("retained for backward compat"))) ==
-          "InitError during initialization of module some_module"
-end

test/precompile.jl

@@ -371,7 +371,7 @@ try
           error("break me")
           end
           """)
-    @test_warn r"ERROR: Error while loading expression starting at.*FooBar2.*caused by.*break me"s try
+    @test_warn "ERROR: LoadError: break me\nStacktrace:\n [1] error" try
         Base.require(Main, :FooBar2)
         error("\"LoadError: break me\" test failed")
     catch exc