Emit closed over values in deterministic order

Author: marcobiscaro2112

src/jvm/clojure/lang/Compiler.java

@@ -4571,7 +4571,7 @@ else if(methodArray[f.reqParms.count()] == null)
 								"Can't have fixed arity function with more params than variadic function");
 				}
 
-			fn.canBeDirect = !fn.hasEnclosingMethod && fn.closes.count() == 0 && !usesThis;
+			fn.canBeDirect = !fn.hasEnclosingMethod && fn.closes.isEmpty() && !usesThis;
 
 			IPersistentCollection methods = null;
 			for(int i = 0; i < methodArray.length; i++)
@@ -4680,7 +4680,7 @@ static public class ObjExpr implements Expr{
 	Type objtype;
 	public final Object tag;
 	//localbinding->itself
-	IPersistentMap closes = PersistentHashMap.EMPTY;
+	List<LocalBinding> closes = new ArrayList<>();
     //localbndingexprs
     IPersistentVector closesExprs = PersistentVector.EMPTY;
 	//symbols
@@ -4737,7 +4737,7 @@ public final Type objtype(){
 		return objtype;
 	}
 
-	public final IPersistentMap closes(){
+	public final List<LocalBinding> closes(){
 		return closes;
 	}
 
@@ -4800,9 +4800,8 @@ static String trimGenID(String name){
 
 	Type[] ctorTypes(){
 		IPersistentVector tv = !supportsMeta()?PersistentVector.EMPTY:RT.vector(IPERSISTENTMAP_TYPE);
-		for(ISeq s = RT.keys(closes); s != null; s = s.next())
+		for(LocalBinding lb : closes())
 			{
-			LocalBinding lb = (LocalBinding) s.first();
 			if(lb.getPrimitiveType() != null)
 				tv = tv.cons(Type.getType(lb.getPrimitiveType()));
 			else
@@ -4867,9 +4866,8 @@ void compile(String superName, String[] interfaceNames, boolean oneTimeUse) thro
 			cv.visitField(ACC_FINAL, "__meta", IPERSISTENTMAP_TYPE.getDescriptor(), null, null);
 			}
 		//instance fields for closed-overs
-		for(ISeq s = RT.keys(closes); s != null; s = s.next())
+		for(LocalBinding lb : closes())
 			{
-			LocalBinding lb = (LocalBinding) s.first();
 			if(isDeftype())
 				{
 				int access = isVolatile(lb) ? ACC_VOLATILE :
@@ -4945,9 +4943,8 @@ void compile(String superName, String[] interfaceNames, boolean oneTimeUse) thro
 			}
 
 		int a = supportsMeta()?2:1;
-		for(ISeq s = RT.keys(closes); s != null; s = s.next(), ++a)
+		for(LocalBinding lb : closes())
 			{
-			LocalBinding lb = (LocalBinding) s.first();
 			ctorgen.loadThis();
 			Class primc = lb.getPrimitiveType();
 			if(primc != null)
@@ -4963,6 +4960,7 @@ void compile(String superName, String[] interfaceNames, boolean oneTimeUse) thro
 				ctorgen.putField(objtype, lb.name, OBJECT_TYPE);
 				}
             closesExprs = closesExprs.cons(new LocalBindingExpr(lb, null));
+			++a;
 			}
 
 
@@ -5073,9 +5071,8 @@ void compile(String superName, String[] interfaceNames, boolean oneTimeUse) thro
 			gen.dup();
 			gen.loadArg(0);
 
-			for(ISeq s = RT.keys(closes); s != null; s = s.next(), ++a)
+			for(LocalBinding lb : closes())
 				{
-				LocalBinding lb = (LocalBinding) s.first();
 				gen.loadThis();
 				Class primc = lb.getPrimitiveType();
 				if(primc != null)
@@ -5086,6 +5083,7 @@ void compile(String superName, String[] interfaceNames, boolean oneTimeUse) thro
 					{
 					gen.getField(objtype, lb.name, OBJECT_TYPE);
 					}
+				++a;
 				}
 
 			gen.invokeConstructor(objtype, new Method("<init>", Type.VOID_TYPE, ctorTypes));
@@ -5522,9 +5520,8 @@ public void emitLetFnInits(GeneratorAdapter gen, ObjExpr objx, IPersistentSet le
 		//objx arg is enclosing objx, not this
 		gen.checkCast(objtype);
 
-		for(ISeq s = RT.keys(closes); s != null; s = s.next())
+		for(LocalBinding lb : closes())
 			{
-			LocalBinding lb = (LocalBinding) s.first();
 			if(letFnLocals.contains(lb))
 				{
 				Class primc = lb.getPrimitiveType();
@@ -5608,7 +5605,7 @@ public void emitAssignLocal(GeneratorAdapter gen, LocalBinding lb,Expr val){
 	}
 
 	private void emitLocal(GeneratorAdapter gen, LocalBinding lb, boolean clear){
-		if(closes.containsKey(lb))
+		if(closes.contains(lb))
 			{
 			Class primc = lb.getPrimitiveType();
 			gen.loadThis();
@@ -5680,7 +5677,7 @@ private void emitLocal(GeneratorAdapter gen, LocalBinding lb, boolean clear){
 	private void emitUnboxedLocal(GeneratorAdapter gen, LocalBinding lb){
 		int argoff = canBeDirect ?0:1;
 		Class primc = lb.getPrimitiveType();
-		if(closes.containsKey(lb))
+		if(closes.contains(lb))
 			{
 			gen.loadThis();
 			gen.getField(objtype, lb.name, Type.getType(primc));
@@ -6561,7 +6558,7 @@ public LocalBindingExpr(LocalBinding b, Symbol tag)
                 }
 
             ObjMethod method = ((ObjMethod) METHOD.deref());
-            boolean closedOver = method.objx.closes.containsKey(b);
+            boolean closedOver = method.objx.closes.contains(b);
             if(clearRoot == b.clearPathRoot || (closedOver && clearRoot == method.clearRoot))
                 {
                 this.shouldClear = true;
@@ -8055,7 +8052,7 @@ static void closeOver(LocalBinding b, ObjMethod method){
         LocalBinding lb = (LocalBinding) RT.get(method.locals, b);
 		if(lb == null)
 			{
-			method.objx.closes = (IPersistentMap) RT.assoc(method.objx.closes, b, b);
+			if (!method.objx.closes.contains(b)) method.objx.closes.add(b);
 			closeOver(b, method.parent);
 			}
 		else {
@@ -8513,20 +8510,19 @@ static ObjExpr build(IPersistentVector interfaceSyms, IPersistentVector fieldSym
 		if(fieldSyms != null)
 			{
 			IPersistentMap fmap = PersistentHashMap.EMPTY;
-			Object[] closesvec = new Object[2 * fieldSyms.count()];
+			List<LocalBinding> closes = new ArrayList<>(fieldSyms.count());
 			for(int i=0;i<fieldSyms.count();i++)
 				{
 				Symbol sym = (Symbol) fieldSyms.nth(i);
 				LocalBinding lb = new LocalBinding(-1, sym, null,
 				                                   new MethodParamExpr(tagClass(tagOf(sym))),false,null);
 				fmap = fmap.assoc(sym, lb);
-				closesvec[i*2] = lb;
-				closesvec[i*2 + 1] = lb;
+				closes.add(lb);
 				}
 
 			//todo - inject __meta et al into closes - when?
 			//use array map to preserve ctor order
-			ret.closes = new PersistentArrayMap(closesvec);
+			ret.closes = closes;
 			ret.fields = fmap;
 			for(int i=fieldSyms.count()-1;i >= 0 && (((Symbol)fieldSyms.nth(i)).name.equals("__meta")
                                                      || ((Symbol)fieldSyms.nth(i)).name.equals("__extmap")
@@ -8632,9 +8628,8 @@ static Class compileStub(String superName, NewInstanceExpr ret, String[] interfa
 		         null,superName,interfaceNames);
 
 		//instance fields for closed-overs
-		for(ISeq s = RT.keys(ret.closes); s != null; s = s.next())
+		for(LocalBinding lb : ret.closes())
 			{
-			LocalBinding lb = (LocalBinding) s.first();
 			int access = ACC_PUBLIC + (ret.isVolatile(lb) ? ACC_VOLATILE :
 			                           ret.isMutable(lb) ? 0 :
 			                           ACC_FINAL);