CLJ-1809 fix local indexing error in direct linking

bronsa · stuarthalloway · commit 20f3094afd75 · 2015-10-27T13:59:50.000-04:00
Signed-off-by: Stuart Halloway &lt;stu@cognitect.com&gt;
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
@@ -4012,9 +4012,9 @@ else if(methodArray[f.reqParms.count()] == null)
 						{
 						for(LocalBinding lb : (Collection<LocalBinding>)RT.keys(fm.locals))
 							{
-							lb.idx -= 1;
+							if(lb.isArg)
+								lb.idx -= 1;
 							}
-						fm.maxLocal -= 1;
 						}
 					}
 				}
diff --git a/test/clojure/test_clojure/compilation.clj b/test/clojure/test_clojure/compilation.clj
@@ -356,3 +356,9 @@
   (is (thrown? RuntimeException (eval '(defn foo [] (throw RuntimeException any-symbol)))))
   (is (thrown? RuntimeException (eval '(defn foo [] (throw (RuntimeException.) any-symbol)))))
   (is (var? (eval '(defn foo [] (throw (IllegalArgumentException.)))))))
+
+(deftest clj-1809
+  (is (eval `(fn [y#]
+               (try
+                 (finally
+                   (let [z# y#])))))))

Original file line number	Diff line number	Diff line change
`@@ -4012,9 +4012,9 @@ else if(methodArray[f.reqParms.count()] == null)`
`4012`	`4012`	`{`
`4013`	`4013`	`for(LocalBinding lb : (Collection<LocalBinding>)RT.keys(fm.locals))`
`4014`	`4014`	`{`
`4015`		`- lb.idx -= 1;`
	`4015`	`+ if(lb.isArg)`
	`4016`	`+ lb.idx -= 1;`
`4016`	`4017`	`}`
`4017`		`- fm.maxLocal -= 1;`
`4018`	`4018`	`}`
`4019`	`4019`	`}`
`4020`	`4020`	`}`