Merge pull request #11311 from yuyichao/warning-bt

Print filename and line number for deprecation warnings

base/deprecated.jl

@@ -38,10 +38,13 @@ macro deprecate(old,new)
 end
 
 function depwarn(msg, funcsym)
-    if JLOptions().depwarn!=0
+    if JLOptions().depwarn != 0
+        ln = unsafe_load(cglobal(:jl_lineno, Int))
+        fn = bytestring(unsafe_load(cglobal(:jl_filename, Ptr{Cchar})))
         bt = backtrace()
         caller = firstcaller(bt, funcsym)
-        warn(msg, once=(caller!=C_NULL), key=caller, bt=bt)
+        warn(msg, once=(caller != C_NULL), key=caller, bt=bt,
+             filename=fn, lineno=ln)
     end
 end
 

base/util.jl

@@ -352,7 +352,9 @@ const have_warned = Set()
 warn_once(io::IO, msg...) = warn(io, msg..., once=true)
 warn_once(msg...) = warn(STDERR, msg..., once=true)
 
-function warn(io::IO, msg...; prefix="WARNING: ", once=false, key=nothing, bt=nothing)
+function warn(io::IO, msg...;
+              prefix="WARNING: ", once=false, key=nothing, bt=nothing,
+              filename=nothing, lineno::Int=0)
     str = chomp(string(msg...))
     if once
         if key === nothing
@@ -365,6 +367,9 @@ function warn(io::IO, msg...; prefix="WARNING: ", once=false, key=nothing, bt=no
     if bt !== nothing
         show_backtrace(io, bt)
     end
+    if filename !== nothing
+        print(io, "\nwhile loading $filename, in expression starting on line $lineno")
+    end
     println(io)
     return
 end
@@ -384,4 +389,3 @@ function julia_cmd(julia=joinpath(JULIA_HOME, julia_exename()))
 end
 
 julia_exename() = ccall(:jl_is_debugbuild,Cint,())==0 ? "julia" : "julia-debug"
-

src/toplevel.c

@@ -25,7 +25,9 @@ extern "C" {
 #endif
 
 // current line number in a file
-int jl_lineno = 0;
+DLLEXPORT int jl_lineno = 0;
+// current file name
+DLLEXPORT const char *jl_filename = "no file";
 
 jl_module_t *jl_old_base_module = NULL;
 // the Main we started with, in case it is switched
@@ -535,7 +537,9 @@ jl_value_t *jl_parse_eval_all(const char *fname, size_t len)
 {
     //jl_printf(JL_STDERR, "***** loading %s\n", fname);
     int last_lineno = jl_lineno;
-    jl_lineno=0;
+    const char *last_filename = jl_filename;
+    jl_lineno = 0;
+    jl_filename = fname;
     jl_value_t *fn=NULL, *ln=NULL, *form=NULL, *result=jl_nothing;
     JL_GC_PUSH4(&fn, &ln, &form, &result);
     JL_TRY {
@@ -560,6 +564,7 @@ jl_value_t *jl_parse_eval_all(const char *fname, size_t len)
         fn = jl_pchar_to_string(fname, strlen(fname));
         ln = jl_box_long(jl_lineno);
         jl_lineno = last_lineno;
+        jl_filename = last_filename;
         if (jl_loaderror_type == NULL) {
             jl_rethrow();
         }
@@ -570,6 +575,7 @@ jl_value_t *jl_parse_eval_all(const char *fname, size_t len)
     }
     jl_stop_parsing();
     jl_lineno = last_lineno;
+    jl_filename = last_filename;
     JL_GC_POP();
     return result;
 }