fix more

Author: aviatesk

test/interpret.jl

@@ -648,7 +648,10 @@ end
 let
     # NOTE we need to make sure this code block is compiled, since vecadd is generated function,
     # but currently `@interpret` doesn't handle a call to generated functions very well
-    @static isdefined(Base.Experimental, Symbol("@force_compile")) && Base.Experimental.@force_compile
+    @static if isdefined(Base, :Experimental) &&
+               isdefined(Base.Experimental, Symbol("@force_compile"))
+        Base.Experimental.@force_compile
+    end
     a = (VecElement{Float64}(1.0), VecElement{Float64}(2.0))
     @test @interpret(VecTest.vecadd(a, a)) == VecTest.vecadd(a, a)
 end

test/limits.jl

@@ -40,6 +40,9 @@ end
     frame = Frame(modexs[5]...)
     if VERSION < v"1.4.0-DEV.475"
         @test Aborted(frame, 1).at.file == Symbol("util.jl")
+    elseif isdefined(Base, :Experimental) &&
+           isdefined(Base.Experimental, Symbol("@force_compile"))
+        @test Aborted(frame, 1).at.file == Symbol("timing.jl")
     else
         @test Aborted(frame, 1).at.file == Symbol("fake.jl")
     end
@@ -97,7 +100,7 @@ module EvalLimited end
     end
     @test 8 < EvalLimited.s < 50  # with Compiled(), 9 statements per iteration
     @test length(aborts) == 1
-    @test aborts[1].at.line ∈ (2, 3, 4)  # 2 corresponds to lowering of the for loop
+    @test aborts[1].at.line ∈ (2, 3, 4, 5)  # 2 corresponds to lowering of the for loop
 
     # Now try again with recursive stack
     empty!(aborts)
@@ -116,8 +119,8 @@ module EvalLimited end
     @test length(aborts) == 1
     lin = aborts[1].at
     if lin.file == Symbol("fake.jl")
-        @test lin.line ∈ (2, 3, 4)
+        @test lin.line ∈ (2, 3, 4, 5)
     else
-        @test lin.file == Symbol("range.jl")  # if it aborts in `iterate`
+        @test lin.method === :iterate || lin.method === :getproperty
     end
 end