detector for new clearing

Author: puredanger

src/jvm/clojure/lang/Compiler.java

@@ -5860,9 +5860,8 @@ static FnMethod parse(ObjExpr objx, ISeq form, Object rettag) {
 			method.line = lineDeref();
 			method.column = columnDeref();
 			//register as the current method and set up a new env frame
-            PathNode pnode =  (PathNode) CLEAR_PATH.get();
-			if(pnode == null)
-				pnode = new PathNode(PATHTYPE.PATH,null);
+            PathNode pnode = new PathNode(PATHTYPE.PATH,null);
+			method.clearRoot = pnode;
 			Var.pushThreadBindings(
 					RT.mapUniqueKeys(
 							METHOD, method,
@@ -6306,6 +6305,7 @@ abstract public static class ObjMethod{
 	boolean usesThis = false;
 	PersistentHashSet localsUsedInCatchFinally = PersistentHashSet.EMPTY;
 	protected IPersistentMap methodMeta;
+	PathNode clearRoot;
 
 
 	public final IPersistentMap locals(){
@@ -6560,12 +6560,20 @@ public LocalBindingExpr(LocalBinding b, Symbol tag)
                     }
                 }
 
-            if(clearRoot == b.clearPathRoot)
+            ObjMethod method = ((ObjMethod) METHOD.deref());
+            boolean closedOver = method.objx.closes.containsKey(b);
+            boolean oldd = clearRoot == b.clearPathRoot;
+            boolean newd = closedOver && (clearRoot == method.clearRoot);
+            if (oldd || newd)
                 {
                 this.shouldClear = true;
                 sites = RT.conj(sites,this);
                 CLEAR_SITES.set(RT.assoc(CLEAR_SITES.get(), b, sites));
                 }
+            if (!oldd && newd && method.objx.onceOnly) {
+				RT.errPrintWriter().format("%s:%d closed-over %s improperly retained\n",
+						currentNS(), lineDeref(), b.sym);
+            }
 //            else
 //                dummy = null;
             }
@@ -8062,7 +8070,6 @@ static void closeOver(LocalBinding b, ObjMethod method){
 		}
 }
 
-
 static LocalBinding referenceLocal(Symbol sym) {
 	if(!LOCAL_ENV.isBound())
 		return null;
@@ -8967,7 +8974,8 @@ static NewInstanceMethod parse(ObjExpr objx, ISeq form, Symbol thistag,
 			method.line = lineDeref();
 			method.column = columnDeref();
 			//register as the current method and set up a new env frame
-            PathNode pnode =  new PathNode(PATHTYPE.PATH, (PathNode) CLEAR_PATH.get());
+            PathNode pnode = new PathNode(PATHTYPE.PATH, null);
+			method.clearRoot = pnode;
 			Var.pushThreadBindings(
 					RT.mapUniqueKeys(
 							METHOD, method,