Merge pull request #14 from JuliaDebug/teh/ccall

Allow ccalls that hardcode 2 Symbols
JuliaLang · Feb 10, 2019 · 45c5368 · 45c5368
2 parents 62bb82a + 43d6741
commit 45c5368
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/interpret.jl b/src/interpret.jl
@@ -108,6 +108,7 @@ instantiate_type_in_env(arg, spsig, spvals) =
 
 function resolvefc(@nospecialize expr)
     (isa(expr, Symbol) || isa(expr, String) || isa(expr, QuoteNode)) && return expr
+    isa(expr, Tuple{Symbol,Symbol}) && return expr
     if isexpr(expr, :call)
         a = expr.args[1]
         (isa(a, QuoteNode) && a.value == Core.tuple) || error("unexpected ccall to ", expr)

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -39,6 +39,7 @@ fkw(x::Int8; y=0, z="hello") = y
 frame = JuliaInterpreter.prepare_toplevel(Main, :(Vararg.body.body.name))
 @test JuliaInterpreter.finish_and_return!(JuliaStackFrame[], frame, true) === Vararg.body.body.name
 
+# issue #8
 ex = quote
     if sizeof(JLOptions) === ccall(:jl_sizeof_jl_options, Int, ())
     else
@@ -47,3 +48,12 @@ ex = quote
 end
 frame = JuliaInterpreter.prepare_toplevel(Base, ex)
 JuliaInterpreter.finish_and_return!(JuliaStackFrame[], frame, true)
+
+# ccall with two Symbols
+ex = quote
+    @testset "Some tests" begin
+       @test 2 > 1
+    end
+end
+frame = JuliaInterpreter.prepare_toplevel(Main, ex)
+JuliaInterpreter.finish_and_return!(JuliaStackFrame[], frame, true)