Improve hygiene (#24)

Closes #23

Author: timholy

Project.toml

@@ -1,7 +1,7 @@
 name = "PrecompileTools"
 uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 authors = ["Tim Holy <[email protected]>", "t-bltg <[email protected]>", "and contributors"]
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"

src/workloads.jl

@@ -71,14 +71,14 @@ macro compile_workload(ex::Expr)
         ex = quote
             begin
                 Base.Experimental.@force_compile
-                $ex
+                $(esc(ex))
             end
         end
     else
         # Use the hack on earlier Julia versions that blocks the interpreter
         ex = quote
             while false end
-            $ex
+            $(esc(ex))
         end
     end
     if have_inference_tracking
@@ -94,11 +94,11 @@ macro compile_workload(ex::Expr)
             $PrecompileTools.precompile_roots(Core.Compiler.Timings._timings[1].children)
         end
     end
-    return esc(quote
+    return quote
         if $iscompiling || $PrecompileTools.verbose[]
             $ex
         end
-    end)
+    end
 end
 
 """
@@ -131,9 +131,9 @@ macro setup_workload(ex::Expr)
     end
     # Ideally we'd like a `let` around this to prevent namespace pollution, but that seem to
     # trigger inference & codegen in undesirable ways (see #16).
-    return esc(quote
+    return quote
         if $iscompiling || $PrecompileTools.verbose[]
-            $ex
+            $(esc(ex))
         end
-    end)
+    end
 end

test/runtests.jl

@@ -65,6 +65,7 @@ using UUIDs
 
         projfile = Base.active_project()
         Pkg.activate("PC_D")
+        Pkg.instantiate()
         using PC_D
 
         PrecompileTools.Preferences.set_preferences!(PC_D, "precompile_workload" => false)