azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of calculating element type twice.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-02-11 16:41:44 +04:00
parent ca344d93cd
commit ab99856c16
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+4 -12
View File
@@ -464,7 +464,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
CallableDescriptor rangeTo = resolvedCall.getResultingDescriptor(); CallableDescriptor rangeTo = resolvedCall.getResultingDescriptor();
if (RangeCodegenUtil.isOptimizableRangeTo(rangeTo)) { if (RangeCodegenUtil.isOptimizableRangeTo(rangeTo)) {
generateForLoop(new ForInRangeLiteralLoopGenerator(forExpression, binaryCall, resolvedCall)); generateForLoop(new ForInRangeLiteralLoopGenerator(forExpression, binaryCall));
return StackValue.none(); return StackValue.none();
} }
} }
@@ -526,12 +526,14 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
private final List<Runnable> afterLoopLeaveVariableTasks = Lists.newArrayList(); private final List<Runnable> afterLoopLeaveVariableTasks = Lists.newArrayList();
protected final JetType elementType; protected final JetType elementType;
protected final Type asmElementType;
protected int loopParameterVar; protected int loopParameterVar;
private AbstractForLoopGenerator(@NotNull JetForExpression forExpression) { private AbstractForLoopGenerator(@NotNull JetForExpression forExpression) {
this.forExpression = forExpression; this.forExpression = forExpression;
this.elementType = getElementType(forExpression); this.elementType = getElementType(forExpression);
this.asmElementType = asmType(elementType);
} }
@NotNull @NotNull
@@ -568,7 +570,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
assert multiParameter != null; assert multiParameter != null;
// E tmp<e> = tmp<iterator>.next() // E tmp<e> = tmp<iterator>.next()
final Type asmElementType = asmType(elementType);
loopParameterVar = createLoopTempVariable(asmElementType); loopParameterVar = createLoopTempVariable(asmElementType);
} }
} }
@@ -589,7 +590,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
private void generateMultiVariables(List<JetMultiDeclarationEntry> entries) { private void generateMultiVariables(List<JetMultiDeclarationEntry> entries) {
Type asmElementType = asmType(elementType);
for (JetMultiDeclarationEntry variableDeclaration : entries) { for (JetMultiDeclarationEntry variableDeclaration : entries) {
final VariableDescriptor componentDescriptor = bindingContext.get(BindingContext.VARIABLE, variableDeclaration); final VariableDescriptor componentDescriptor = bindingContext.get(BindingContext.VARIABLE, variableDeclaration);
@@ -775,7 +775,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
@Override @Override
protected void assignToLoopParameter() { protected void assignToLoopParameter() {
Type arrayElParamType; Type arrayElParamType;
Type asmElementType = asmType(elementType);
if (KotlinBuiltIns.getInstance().isArray(loopRangeType)) { if (KotlinBuiltIns.getInstance().isArray(loopRangeType)) {
arrayElParamType = boxType(asmElementType); arrayElParamType = boxType(asmElementType);
} }
@@ -798,26 +797,19 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
private class ForInRangeLiteralLoopGenerator extends AbstractForLoopGenerator { private class ForInRangeLiteralLoopGenerator extends AbstractForLoopGenerator {
private final RangeCodegenUtil.BinaryCall rangeCall; private final RangeCodegenUtil.BinaryCall rangeCall;
private final ResolvedCall<? extends CallableDescriptor> resolvedCall;
private Type asmElementType;
private int lastVar; private int lastVar;
private ForInRangeLiteralLoopGenerator( private ForInRangeLiteralLoopGenerator(
@NotNull JetForExpression forExpression, @NotNull JetForExpression forExpression,
@NotNull RangeCodegenUtil.BinaryCall rangeCall, @NotNull RangeCodegenUtil.BinaryCall rangeCall
ResolvedCall<? extends CallableDescriptor> resolvedCall
) { ) {
super(forExpression); super(forExpression);
this.rangeCall = rangeCall; this.rangeCall = rangeCall;
this.resolvedCall = resolvedCall;
} }
@Override @Override
public void beforeLoop() { public void beforeLoop() {
super.beforeLoop(); super.beforeLoop();
JetType elementType = RangeCodegenUtil.getPrimitiveRangeElementType(resolvedCall.getResultingDescriptor().getReturnType());
assert elementType != null;
asmElementType = asmType(elementType);
gen(rangeCall.left, asmElementType); gen(rangeCall.left, asmElementType);
v.store(loopParameterVar, asmElementType); v.store(loopParameterVar, asmElementType);