Merge 0406840 into 8df3bef

JuliaDebug · Nov 19, 2020 · 1fb51ca · 1fb51ca
2 parents 8df3bef + 0406840
commit 1fb51ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/interpret.jl b/src/interpret.jl
@@ -47,7 +47,7 @@ macro lookup(args...)
     nodetmp = gensym(:node)  # used to hoist, e.g., args[4]
     if havemod
         fallback = quote
-            isa($nodetmp, Symbol) ? getfield($(esc(mod)), $nodetmp) :
+            isa($nodetmp, Symbol) && isdefined($(esc(mod)), $nodetmp) ? getfield($(esc(mod)), $nodetmp) :
             $nodetmp
         end
     else
@@ -61,7 +61,7 @@ macro lookup(args...)
         isa($nodetmp, GlobalRef) ? lookup_var($(esc(frame)), $nodetmp) :
         isa($nodetmp, SlotNumber) ? lookup_var($(esc(frame)), $nodetmp) :
         isa($nodetmp, QuoteNode) ? $nodetmp.value :
-        isa($nodetmp, Symbol) ? getfield(moduleof($(esc(frame))), $nodetmp) :
+        isa($nodetmp, Symbol) && isdefined(moduleof($(esc(frame))), $nodetmp) ? getfield(moduleof($(esc(frame))), $nodetmp) :
         isa($nodetmp, Expr) ? lookup_expr($(esc(frame)), $nodetmp) :
         $fallback
     end

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -702,3 +702,8 @@ end
     frame = JuliaInterpreter.enter_call(A396, 3)
     @test length(JuliaInterpreter.locals(frame)) > 0
 end
+
+@testset "logging" begin
+    foo(x) = @info x
+    @test @interpret(foo(2)) === nothing
+end