Fix tests

Author: c42f

test/backtrace.jl

@@ -16,16 +16,18 @@ function get_bt_frames(functionname, bt)
 end
 
 # same-file inline
-eval(Expr(:function, Expr(:call, :test_inline_1),
-          Expr(:block, Expr(:line, 99, Symbol("backtrace.jl")),
-                       Expr(:block, Expr(:line, 42),
-                                    Expr(:meta, :push_loc, Symbol("backtrace.jl"), :inlfunc),
-                                    Expr(:line, 37),
-                                    Expr(:call, :throw, "foo"),
-                                    Expr(:meta, :pop_loc),
-                                    Expr(:line, 99)))))
+eval(Expr(:block,
+          Expr(:line, 101, Symbol("backtrace.jl")),
+          Expr(:function, Expr(:call, :test_inline_1),
+               Expr(:block, Expr(:line, 99, Symbol("backtrace.jl")),
+                    Expr(:block, Expr(:line, 42),
+                                 Expr(:meta, :push_loc, Symbol("backtrace.jl"), :inlfunc),
+                                 Expr(:line, 37),
+                                 Expr(:call, :throw, "foo"),
+                                 Expr(:meta, :pop_loc),
+                                 Expr(:line, 99))))))
 
-@test functionloc(test_inline_1) == ("backtrace.jl", 99)
+@test functionloc(test_inline_1) == ("backtrace.jl", 101)
 try
     test_inline_1()
     error("unexpected")
@@ -42,15 +44,17 @@ end
 
 # different-file inline
 const absfilepath = Sys.iswindows() ? "C:\\foo\\bar\\baz.jl" : "/foo/bar/baz.jl"
-eval(Expr(:function, Expr(:call, :test_inline_2),
-          Expr(:block, Expr(:line, 81, Symbol("backtrace.jl")),
-                       Expr(:block, Expr(:meta, :push_loc, Symbol(absfilepath)),
-                                    Expr(:line, 111),
-                                    Expr(:call, :throw, "foo"),
-                                    Expr(:meta, :pop_loc),
-                                    Expr(:line, 99)))))
+eval(Expr(:block,
+          Expr(:line, 101, Symbol("backtrace.jl")),
+          Expr(:function, Expr(:call, :test_inline_2),
+               Expr(:block, Expr(:line, 81, Symbol("backtrace.jl")),
+                    Expr(:block, Expr(:meta, :push_loc, Symbol(absfilepath)),
+                                 Expr(:line, 111),
+                                 Expr(:call, :throw, "foo"),
+                                 Expr(:meta, :pop_loc),
+                                 Expr(:line, 99))))))
 
-@test functionloc(test_inline_2) == ("backtrace.jl", 81)
+@test functionloc(test_inline_2) == ("backtrace.jl", 101)
 try
     test_inline_2()
     error("unexpected")

test/reflection.jl

@@ -288,6 +288,7 @@ let rts = return_types(TLayout)
 end
 
 # issue #15447
+f15447_line = @__LINE__() + 1
 @noinline function f15447(s, a)
     if s
         return a
@@ -296,15 +297,15 @@ end
         return nb
     end
 end
-@test functionloc(f15447)[2] > 0
+@test functionloc(f15447)[2] == f15447_line
 
 # issue #14346
 @noinline function f14346(id, mask, limit)
     if id <= limit && mask[id]
         return true
     end
 end
-@test functionloc(f14346)[2] == @__LINE__() - 4
+@test functionloc(f14346)[2] == @__LINE__() - 5
 
 # issue #15714
 # show variable names for slots and suppress spurious type warnings

test/syntax.jl

@@ -1037,7 +1037,10 @@ end
 
 let f(x) =
       g(x) = 1
-    @test functionloc(f(1))[2] > functionloc(f)[2]
+    # After fixing functionloc to point to the definition line for multiline
+    # functions, short form functions within expressions may get the wrong
+    # location without parser changes.
+    @test_broken functionloc(f(1))[2] > functionloc(f)[2]
 end
 
 # let-bound functions with `where` and static parameters