Fix asmcall macro hygiene. (#338)

Author: maleadt

src/interop/asmcall.jl

@@ -43,21 +43,21 @@ macro asmcall(asm::String, constraints::String, side_effects::Bool,
               argtyp::Union{Expr,Type}=:(Tuple{}), args...)
     asm_val = Val{Symbol(asm)}()
     constraints_val = Val{Symbol(constraints)}()
-    return esc(:(LLVM.Interop._asmcall($asm_val, $constraints_val,
-                                       Val{$side_effects}(), Val{$rettyp}(), Val{$argtyp}(),
-                                       $(args...))))
+    return esc(:($Interop._asmcall($asm_val, $constraints_val,
+                                   Val{$side_effects}(), Val{$rettyp}(), Val{$argtyp}(),
+                                   $(args...))))
 end
 
 # shorthand: no side_effects
 macro asmcall(asm::String, constraints::String,
               rettyp::Union{Expr,Symbol,Type}=:(Nothing),
               argtyp::Union{Expr,Type}=:(Tuple{}), args...)
-    esc(:(LLVM.Interop.@asmcall $asm $constraints false $rettyp $argtyp $(args...)))
+    esc(:($Interop.@asmcall $asm $constraints false $rettyp $argtyp $(args...)))
 end
 
 # shorthand: no side_effects or constraints
 macro asmcall(asm::String,
               rettyp::Union{Expr,Symbol,Type}=:(Nothing),
               argtyp::Union{Expr,Type}=:(Tuple{}), args...)
-    esc(:(LLVM.Interop.@asmcall $asm "" $rettyp $argtyp $(args...)))
+    esc(:($Interop.@asmcall $asm "" $rettyp $argtyp $(args...)))
 end

test/interop.jl

@@ -51,35 +51,35 @@ end
 # only asm
 
 a1() = @asmcall("nop")
-@test a1() == nothing
+@test a1() === nothing
 
 a2() = @asmcall("nop", Nothing)
-@test a2() == nothing
+@test a2() === nothing
 
 a3() = @asmcall("nop", Nothing, Tuple{})
-@test a3() == nothing
+@test a3() === nothing
 
 # asm + constraints
 
 b1() = @asmcall("nop", "")
-@test b1() == nothing
+@test b1() === nothing
 
 b2() = @asmcall("nop", "", Nothing)
-@test b2() == nothing
+@test b2() === nothing
 
 b3() = @asmcall("nop", "", Nothing, Tuple{})
-@test b3() == nothing
+@test b3() === nothing
 
 # asm + constraints + side-effects
 
 c1() = @asmcall("nop", "", false)
-@test c1() == nothing
+@test c1() === nothing
 
 c2() = @asmcall("nop", "", false, Nothing)
-@test c2() == nothing
+@test c2() === nothing
 
 c3() = @asmcall("nop", "", false, Nothing, Tuple{})
-@test c3() == nothing
+@test c3() === nothing
 
 if Sys.ARCH == :x86 || Sys.ARCH == :x86_64
 
@@ -97,6 +97,18 @@ e1() = @asmcall("mov \$\$1, \$0; mov \$\$2, \$1;", "=r,=r", Tuple{Int16,Int32})
 
 end
 
+@testset "macro hygiene" begin
+    mod = @eval module $(gensym())
+        module Inner
+            using LLVM, LLVM.Interop
+        end
+
+        foo() = Inner.@asmcall("nop")
+    end
+
+    @test mod.foo() === nothing
+end
+
 end