m-labs · Nov 23, 2015 · Nov 23, 2015
Showing with 15 additions and 1 deletion.

+1 −1 artiq/compiler/transforms/llvm_ir_generator.py

+14 −0 lit-test/test/interleaving/pure_impure_tie.py
diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -541,7 +541,7 @@ def process_SetLocal(self, insn):
             # The environment argument is an i8*, so that all closures can
             # unify with each other regardless of environment type or size.
             # We fixup the type on assignment into the "$outer" slot.
-            assert isinstance(insn.value(), ir.EnvironmentArgument)
+            assert insn.var_name == '$outer'
             llvalue = self.llbuilder.bitcast(llvalue, llptr.type.pointee)
         return self.llbuilder.store(llvalue, llptr)
 

diff --git a/lit-test/test/interleaving/pure_impure_tie.py b/lit-test/test/interleaving/pure_impure_tie.py
@@ -0,0 +1,14 @@
+# RUN: %python -m artiq.compiler.testbench.jit %s >%t
+# RUN: OutputCheck %s --file-to-check=%t
+
+def f():
+    delay_mu(2)
+
+def g():
+    with parallel:
+        f()
+        delay_mu(2)
+    print(now_mu())
+
+# CHECK-L: 2
+g()