re-enable lazy fn loader

Author: richhickey

src/jvm/clojure/lang/Compiler.java

@@ -3745,6 +3745,7 @@ static public class FnExpr extends ObjExpr{
 	IPersistentCollection methods;
 	private boolean hasPrimSigs;
 	private boolean hasMeta;
+	private boolean hasEnclosingMethod;
 	//	String superName = null;
 
 	public FnExpr(Object tag){
@@ -3790,6 +3791,7 @@ static Expr parse(C context, ISeq form, String name) {
 		FnExpr fn = new FnExpr(tagOf(form));
 		fn.src = form;
 		ObjMethod enclosingMethod = (ObjMethod) METHOD.deref();
+		fn.hasEnclosingMethod = enclosingMethod != null;
 		if(((IMeta) form.first()).meta() != null)
 			{
 			fn.onceOnly = RT.booleanCast(RT.get(RT.meta(form.first()), Keyword.intern(null, "once")));
@@ -3936,18 +3938,20 @@ public final IPersistentCollection methods(){
 	}
 
 	public void emitForDefn(ObjExpr objx, GeneratorAdapter gen){
-//		if(!hasPrimSigs && closes.count() == 0)
-//			{
-//			Type thunkType = Type.getType(FnLoaderThunk.class);
-////			presumes var on stack
-//			gen.dup();
-//			gen.newInstance(thunkType);
-//			gen.dupX1();
-//			gen.swap();
-//			gen.push(internalName.replace('/','.'));
-//			gen.invokeConstructor(thunkType,Method.getMethod("void <init>(clojure.lang.Var,String)"));
-//			}
-//		else
+		if(!hasEnclosingMethod && !hasPrimSigs && closes.count() == 0)
+			{
+			String iname = internalName.replace('/','.');
+//			System.out.println("emit var for defn: " + name + ", iname: " + iname);
+			Type thunkType = Type.getType(FnLoaderThunk.class);
+//			presumes var on stack
+			gen.dup();
+			gen.newInstance(thunkType);
+			gen.dupX1();
+			gen.swap();
+			gen.push(iname);
+			gen.invokeConstructor(thunkType,Method.getMethod("void <init>(clojure.lang.Var,String)"));
+			}
+		else
 			emit(C.EXPRESSION,objx,gen);
 	}
 }

src/jvm/clojure/lang/FnLoaderThunk.java

@@ -51,7 +51,10 @@ private void load() {
 		{
 		try
 			{
+//			long start = System.nanoTime();
 			fn = (IFn) Class.forName(fnClassName,true,loader).newInstance();
+//			long ns = System.nanoTime() - start;
+//			System.out.println("Lazily loaded: " + fnClassName + ", in: " + ns/1000 + "μs");
 			}
 		catch(Exception e)
 			{

src/jvm/clojure/lang/RT.java

@@ -408,7 +408,10 @@ static void compile(String cljfile) throws IOException{
 }
 
 static public void load(String scriptbase) throws IOException, ClassNotFoundException{
+//	long start = System.nanoTime();
 	load(scriptbase, true);
+//	long ns = System.nanoTime() - start;
+//	System.out.println("loaded script: " + scriptbase + ", in: " + ns/1000000 + "ms");
 }
 
 static public void load(String scriptbase, boolean failIfNotFound) throws IOException, ClassNotFoundException{