Merge pull request #16102 from JuliaLang/jb/fix16096

fix #16096, incorrect var renaming inside macrocall exprs in macroexpand
JuliaLang · May 2, 2016 · da7ac48 · da7ac48
2 parents fe92747 + 14114f1
commit da7ac48
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/macroexpand.scm b/src/macroexpand.scm
@@ -230,7 +230,7 @@
  ((macrocall)
  (if (or (eq? (cadr e) '@label) (eq? (cadr e) '@goto)) e
  `(macrocall ,.(map (lambda (x)
- (resolve-expansion-vars- x env m inarg))
+ (resolve-expansion-vars-with-new-env x env m inarg))
  (cdr e)))))
  ((symboliclabel) e)
  ((symbolicgoto) e)

diff --git a/test/core.jl b/test/core.jl
@@ -3866,3 +3866,17 @@ function f16023()
  x = 1
 end
 @test_throws UndefVarError f16023()
+
+# issue #16096
+module M16096
+macro iter()
+ quote
+ @inline function foo(sub)
+ it = 1
+ end
+ end
+end
+end
+let ex = expand(:(@M16096.iter))
+ @test !(isa(ex,Expr) && ex.head === :error)
+end