Fix CLJ-1330: make top-level named functions classnames don't clash with def'ed function classnames

bronsa · stuarthalloway · commit f149260c14a7 · 2014-10-07T13:09:32.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
@@ -3840,17 +3840,28 @@ static Expr parse(C context, ISeq form, String name) {
 //			fn.superName = (String) RT.get(RT.meta(form.first()), Keyword.intern(null, "super-name"));
 			}
 		//fn.thisName = name;
-		String basename = enclosingMethod != null ?
-		                  (enclosingMethod.objx.name + "$")
-		                                          : //"clojure.fns." +
-		                  (munge(currentNS().name.name) + "$");
-		if(RT.second(form) instanceof Symbol)
-			name = ((Symbol) RT.second(form)).name;
-		String simpleName = name != null ?
-		                    (munge(name).replace(".", "_DOT_")
-		                    + (enclosingMethod != null ? "__" + RT.nextID() : ""))
-		                    : ("fn"
-		                      + "__" + RT.nextID());
+
+		String basename = (enclosingMethod != null ?
+		                  enclosingMethod.objx.name
+		                  : (munge(currentNS().name.name))) + "$";
+
+		Symbol nm = null;
+
+		if(RT.second(form) instanceof Symbol) {
+			nm = (Symbol) RT.second(form);
+			if (name == null)
+				name = nm.name + "__" + RT.nextID();
+			else
+				name += "__" + nm.name + "__" + RT.nextID();
+		} else {
+			if(name == null)
+				name = "fn__" + RT.nextID();
+			else if (enclosingMethod != null)
+				name += "__" + RT.nextID();
+		}
+
+		String simpleName = munge(name).replace(".", "_DOT_");
+
 		fn.name = basename + simpleName;
 		fn.internalName = fn.name.replace('.', '/');
 		fn.objtype = Type.getObjectType(fn.internalName);
@@ -3869,9 +3880,8 @@ VAR_CALLSITES, emptyVarCallSites(),
 					));
 
 			//arglist might be preceded by symbol naming this fn
-			if(RT.second(form) instanceof Symbol)
+			if(nm != null)
 				{
-				Symbol nm = (Symbol) RT.second(form);
 				fn.thisName = nm.name;
 				fn.isStatic = false; //RT.booleanCast(RT.get(nm.meta(), staticKey));
 				form = RT.cons(FN, RT.next(RT.next(form)));
