Scope generated IDs by namespace

This ensures that the same IDs are used when compiling anonymous functions/constants/reify/eval/auto/gensym, without depending on the global namespace compilation order.

Author: marcobiscaro2112

src/clj/clojure/core.clj

@@ -610,7 +610,7 @@
   {:added "1.0"
    :static true}
   ([] (gensym "G__"))
-  ([prefix-string] (. clojure.lang.Symbol (intern (str prefix-string (str (. clojure.lang.RT (nextID))))))))
+  ([prefix-string] (. clojure.lang.Symbol (intern (str prefix-string (str (. clojure.lang.RT (nextID (str (.getName *ns*))))))))))
 
 
 (defn keyword

src/jvm/clojure/lang/Compiler.java

@@ -4498,12 +4498,12 @@ static Expr parse(C context, ISeq form, String name) {
 
 		if(RT.second(form) instanceof Symbol) {
 			nm = (Symbol) RT.second(form);
-			name = nm.name + "__" + RT.nextID();
+			name = nm.name + "__" + RT.nextID(basename);
 		} else {
 			if(name == null)
-				name = "fn__" + RT.nextID();
+				name = "fn__" + RT.nextID(basename);
 			else if (enclosingMethod != null)
-				name += "__" + RT.nextID();
+				name += "__" + RT.nextID(basename);
 		}
 
 		String simpleName = munge(name).replace(".", "_DOT_");
@@ -4603,7 +4603,7 @@ else if(methodArray[f.reqParms.count()] == null)
 			fn.protocolCallsites = (IPersistentVector) PROTOCOL_CALLSITES.deref();
 			fn.varCallsites = (IPersistentSet) VAR_CALLSITES.deref();
 
-			fn.constantsID = RT.nextID();
+			fn.constantsID = RT.nextID(basename);
 //			DynamicClassLoader loader = (DynamicClassLoader) LOADER.get();
 //			loader.registerConstants(fn.constantsID, fn.constants.toArray());
 			}
@@ -6821,7 +6821,7 @@ public void emit(C context, ObjExpr objx, GeneratorAdapter gen){
 			BindingInit bi = (BindingInit) bis.first();
 			String lname = bi.binding.name;
 			if(lname.endsWith("__auto__"))
-				lname += RT.nextID();
+				lname += RT.nextID(currentNS().getName().toString());
 			Class primc = maybePrimitiveType(bi.init);
 			if(primc != null)
 				gen.visitLocalVariable(lname, Type.getDescriptor(primc), null, loopLabel, end,
@@ -7052,7 +7052,7 @@ public void doEmit(C context, ObjExpr objx, GeneratorAdapter gen, boolean emitUn
 			BindingInit bi = (BindingInit) bis.first();
 			String lname = bi.binding.name;
 			if(lname.endsWith("__auto__"))
-				lname += RT.nextID();
+				lname += RT.nextID(currentNS().getName().toString());
 			Class primc = maybePrimitiveType(bi.init);
 			if(primc != null)
 				gen.visitLocalVariable(lname, Type.getDescriptor(primc), null, bindingLabels.get(bi), end,
@@ -7695,7 +7695,7 @@ else if((form instanceof IType) ||
 						&& ((Symbol) RT.first(form)).name.startsWith("def"))))
 				{
 				ObjExpr fexpr = (ObjExpr) analyze(C.EXPRESSION, RT.list(FN, PersistentVector.EMPTY, form),
-													"eval" + RT.nextID());
+													"eval" + RT.nextID(currentNS().getName().toString()));
 				IFn fn = (IFn) fexpr.eval();
 				return fn.invoke();
 				}
@@ -8475,7 +8475,7 @@ public Expr parse(C context, Object frm) {
 		String basename = enclosingMethod != null ?
 		                  (trimGenID(enclosingMethod.objx.name) + "$")
 		                 : (munge(currentNS().name.name) + "$");
-		String simpleName = "reify__" + RT.nextID();
+		String simpleName = "reify__" + RT.nextID(currentNS().getName().toString());
 		String classname = basename + simpleName;
 
 		ISeq rform = RT.next(form);
@@ -8594,7 +8594,7 @@ VAR_CALLSITES, emptyVarCallSites(),
 			ret.keywords = (IPersistentMap) KEYWORDS.deref();
 			ret.vars = (IPersistentMap) VARS.deref();
 			ret.constants = (PersistentVector) CONSTANTS.deref();
-			ret.constantsID = RT.nextID();
+			ret.constantsID = RT.nextID(currentNS().getName().toString());
 			ret.keywordCallsites = (IPersistentVector) KEYWORD_CALLSITES.deref();
 			ret.protocolCallsites = (IPersistentVector) PROTOCOL_CALLSITES.deref();
 			ret.varCallsites = (IPersistentSet) VAR_CALLSITES.deref();

src/jvm/clojure/lang/LispReader.java

@@ -863,7 +863,7 @@ public Object invoke(Object reader, Object hash, Object opts, Object pendingForm
 }
 
 static Symbol garg(int n){
-	return Symbol.intern(null, (n == -1 ? "rest" : ("p" + n)) + "__" + RT.nextID() + "#");
+	return Symbol.intern(null, (n == -1 ? "rest" : ("p" + n)) + "__" + RT.nextID(((Namespace)RT.CURRENT_NS.deref()).getName().toString()) + "#");
 }
 
 public static class FnReader extends AFn{
@@ -1022,7 +1022,7 @@ else if(form instanceof Symbol)
 				if(gs == null)
 					GENSYM_ENV.set(gmap.assoc(sym, gs = Symbol.intern(null,
 					                                                  sym.name.substring(0, sym.name.length() - 1)
-					                                                  + "__" + RT.nextID() + "__auto__")));
+					                                                  + "__" + RT.nextID(((Namespace)RT.CURRENT_NS.deref()).getName().toString()) + "__auto__")));
 				sym = gs;
 				}
 			else if(sym.ns == null && sym.name.endsWith("."))

src/jvm/clojure/lang/RT.java

@@ -15,6 +15,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URI;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.Callable;
 import java.util.*;
@@ -294,6 +295,7 @@ private Object readResolve() throws ObjectStreamException {
     }
 }
 
+static Map<String, AtomicInteger> scopedIds = new ConcurrentHashMap<>();
 static AtomicInteger id = new AtomicInteger(1);
 
 static public URL toUrl(String url) throws MalformedURLException {
@@ -524,6 +526,11 @@ static public int nextID(){
 	return id.getAndIncrement();
 }
 
+public static int nextID(String scope) {
+	AtomicInteger id = scopedIds.computeIfAbsent(scope, k -> new AtomicInteger(1));
+	return id.getAndIncrement();
+}
+
 // Load a library in the System ClassLoader instead of Clojure's own.
 public static void loadLibrary(String libname){
     System.loadLibrary(libname);