diff options
| author | Rich Hickey <richhickey@gmail.com> | 2008-07-02 23:59:20 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2008-07-02 23:59:20 +0000 |
| commit | 1a7c8810b0c37f432a7c55ae51e64186c08bd30e (patch) | |
| tree | e69d6afbdb970afb7198f58d6047ae8e29666b10 /src | |
| parent | 364476bded5679fcbe6f5be768d144dbe1d625d1 (diff) | |
removed "no box on statement" optimization so pops align
Diffstat (limited to 'src')
| -rw-r--r-- | src/jvm/clojure/lang/Compiler.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java index 74fa0b0e..1ed14e8e 100644 --- a/src/jvm/clojure/lang/Compiler.java +++ b/src/jvm/clojure/lang/Compiler.java @@ -844,8 +844,8 @@ static class InstanceFieldExpr extends FieldExpr implements AssignableExpr{ target.emit(C.EXPRESSION, fn, gen); gen.checkCast(Type.getType(targetClass)); gen.getField(Type.getType(targetClass), fieldName, Type.getType(field.getType())); - if(context != C.STATEMENT) - HostExpr.emitBoxReturn(fn, gen, field.getType()); + //if(context != C.STATEMENT) + HostExpr.emitBoxReturn(fn, gen, field.getType()); if(context == C.STATEMENT) { gen.pop(); @@ -928,8 +928,8 @@ static class StaticFieldExpr extends FieldExpr implements AssignableExpr{ gen.visitLineNumber(line, gen.mark()); gen.getStatic(Type.getType(c), fieldName, Type.getType(field.getType())); - if(context != C.STATEMENT) - HostExpr.emitBoxReturn(fn, gen, field.getType()); + //if(context != C.STATEMENT) + HostExpr.emitBoxReturn(fn, gen, field.getType()); if(context == C.STATEMENT) { gen.pop(); @@ -1130,8 +1130,8 @@ static class InstanceMethodExpr extends MethodExpr{ gen.invokeInterface(type, m); else gen.invokeVirtual(type, m); - if(context != C.STATEMENT || method.getReturnType() == Void.TYPE) - HostExpr.emitBoxReturn(fn, gen, method.getReturnType()); + //if(context != C.STATEMENT || method.getReturnType() == Void.TYPE) + HostExpr.emitBoxReturn(fn, gen, method.getReturnType()); } else { @@ -1242,8 +1242,8 @@ static class StaticMethodExpr extends MethodExpr{ Type type = Type.getType(c); Method m = new Method(methodName, Type.getReturnType(method), Type.getArgumentTypes(method)); gen.invokeStatic(type, m); - if(context != C.STATEMENT || method.getReturnType() == Void.TYPE) - HostExpr.emitBoxReturn(fn, gen, method.getReturnType()); + //if(context != C.STATEMENT || method.getReturnType() == Void.TYPE) + HostExpr.emitBoxReturn(fn, gen, method.getReturnType()); } else { |