From 9a8b2fd72b675bb8a5bf0322943ee9451787b86a Mon Sep 17 00:00:00 2001
From: Antoine Levitt <antoine.levitt@gmail.com>
Date: Wed, 28 Aug 2019 21:26:58 +0200
Subject: [PATCH] Duplicate include(::String) for nicer stacktraces (#33087)

---
 base/client.jl      | 24 +++++++++++++++++++++++-
 base/loading.jl     |  2 ++
 test/cmdlineargs.jl |  9 +++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/base/client.jl b/base/client.jl
index 878a79c3dc8de..a9377b5b920a9 100644
--- a/base/client.jl
+++ b/base/client.jl
@@ -429,7 +429,29 @@ end
 
 # MainInclude exists to hide Main.include and eval from `names(Main)`.
 baremodule MainInclude
-include(fname::AbstractString) = Main.Base.include(Main, fname)
+# We inline the definition of include from loading.jl/include_relative to get one-frame stacktraces.
+# include(fname::AbstractString) = Main.Base.include(Main, fname)
+function include(fname::AbstractString)
+    mod = Main
+    isa(fname, String) || (fname = String(fname))
+    path, prev = Main.Base._include_dependency(mod, fname)
+    for callback in Main.Base.include_callbacks # to preserve order, must come before Core.include
+        Main.Base.invokelatest(callback, mod, path)
+    end
+    tls = Main.Base.task_local_storage()
+    tls[:SOURCE_PATH] = path
+    local result
+    try
+        result = ccall(:jl_load_, Any, (Any, Any), mod, path)
+    finally
+        if prev === nothing
+            Main.Base.delete!(tls, :SOURCE_PATH)
+        else
+            tls[:SOURCE_PATH] = prev
+        end
+    end
+    return result
+end
 eval(x) = Core.eval(Main, x)
 end
 
diff --git a/base/loading.jl b/base/loading.jl
index 679123791d6ee..16a34a389c975 100644
--- a/base/loading.jl
+++ b/base/loading.jl
@@ -1092,6 +1092,8 @@ function source_dir()
     return p === nothing ? pwd() : dirname(p)
 end
 
+# These functions are duplicated in client.jl/include(::String) for
+# nicer stacktraces. Modifications here have to be backported there
 include_relative(mod::Module, path::AbstractString) = include_relative(mod, String(path))
 function include_relative(mod::Module, _path::String)
     path, prev = _include_dependency(mod, _path)
diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
index 74d98c2511ad5..b9769b74bcbf2 100644
--- a/test/cmdlineargs.jl
+++ b/test/cmdlineargs.jl
@@ -561,15 +561,12 @@ let exename = `$(Base.julia_cmd()) --startup-file=no`
         "Bool(Base.JLOptions().use_sysimage_native_code)"`) == "false"
 end
 
-# backtrace contains type and line number info (esp. on windows #17179)
+# backtrace contains line number info (esp. on windows #17179)
 for precomp in ("yes", "no")
-    succ, out, bt = readchomperrors(`$(Base.julia_cmd()) --startup-file=no --sysimage-native-code=$precomp -E 'include("____nonexistent_file")'`)
+    succ, out, bt = readchomperrors(`$(Base.julia_cmd()) --startup-file=no --sysimage-native-code=$precomp -E 'sqrt(-2)'`)
     @test !succ
     @test out == ""
-    @test occursin("include_relative(::Module, ::String) at $(joinpath(".", "loading.jl"))", bt)
-    lno = match(r"at \.[\/\\]loading\.jl:(\d+)", bt)
-    @test length(lno.captures) == 1
-    @test parse(Int, lno.captures[1]) > 0
+    @test occursin(r"\.jl:(\d+)", bt)
 end
 
 # PR #23002