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

Simplified scheduling leaving temp variables: added create method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-02-08 16:36:37 +04:00
parent fd97bbcbd5
commit e1bc78da72
1 changed files with 21 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+21 -58
View File
@@ -569,13 +569,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
// E tmp<e> = tmp<iterator>.next() // E tmp<e> = tmp<iterator>.next()
final Type asmElementType = asmType(elementType); final Type asmElementType = asmType(elementType);
loopParameterVar = myFrameMap.enterTemp(asmElementType); loopParameterVar = createLoopTempVariable(asmElementType);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(asmElementType);
}
});
} }
} }
@@ -629,14 +623,25 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
gen(forExpression.getBody(), Type.VOID_TYPE); gen(forExpression.getBody(), Type.VOID_TYPE);
} }
protected void runAfterBody(Runnable runnable) { private void runAfterBody(Runnable runnable) {
afterBodyLeaveVariableTasks.add(runnable); afterBodyLeaveVariableTasks.add(runnable);
} }
protected void runAfterLoop(Runnable runnable) { private void runAfterLoop(Runnable runnable) {
afterLoopLeaveVariableTasks.add(runnable); afterLoopLeaveVariableTasks.add(runnable);
} }
protected int createLoopTempVariable(final Type type) {
int varIndex = myFrameMap.enterTemp(type);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(type);
}
});
return varIndex;
}
public void afterBody() { public void afterBody() {
v.mark(bodyEnd); v.mark(bodyEnd);
// e goes out of scope // e goes out of scope
@@ -683,13 +688,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
// Iterator<E> tmp<iterator> = c.iterator() // Iterator<E> tmp<iterator> = c.iterator()
iteratorVarIndex = myFrameMap.enterTemp(asmTypeForIterator); iteratorVarIndex = createLoopTempVariable(asmTypeForIterator);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(asmTypeForIterator);
}
});
Call call = bindingContext.get(LOOP_RANGE_ITERATOR_CALL, forExpression.getLoopRange()); Call call = bindingContext.get(LOOP_RANGE_ITERATOR_CALL, forExpression.getLoopRange());
invokeFunction(call, StackValue.none(), iteratorCall); invokeFunction(call, StackValue.none(), iteratorCall);
@@ -739,13 +738,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
public void beforeLoop() { public void beforeLoop() {
super.beforeLoop(); super.beforeLoop();
indexVar = myFrameMap.enterTemp(Type.INT_TYPE); indexVar = createLoopTempVariable(Type.INT_TYPE);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(Type.INT_TYPE);
}
});
JetExpression loopRange = forExpression.getLoopRange(); JetExpression loopRange = forExpression.getLoopRange();
StackValue value = gen(loopRange); StackValue value = gen(loopRange);
@@ -754,13 +747,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
arrayVar = ((StackValue.Local) value).index; // no need to copy local variable into another variable arrayVar = ((StackValue.Local) value).index; // no need to copy local variable into another variable
} }
else { else {
arrayVar = myFrameMap.enterTemp(OBJECT_TYPE); arrayVar = createLoopTempVariable(OBJECT_TYPE);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(OBJECT_TYPE);
}
});
value.put(asmLoopRangeType, v); value.put(asmLoopRangeType, v);
v.store(arrayVar, OBJECT_TYPE); v.store(arrayVar, OBJECT_TYPE);
} }
@@ -826,23 +813,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
assert elementType != null; assert elementType != null;
asmElementType = asmType(elementType); asmElementType = asmType(elementType);
indexVar = myFrameMap.enterTemp(asmElementType); indexVar = createLoopTempVariable(asmElementType);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(asmElementType);
}
});
gen(rangeCall.left, asmElementType); gen(rangeCall.left, asmElementType);
v.store(indexVar, asmElementType); v.store(indexVar, asmElementType);
lastVar = myFrameMap.enterTemp(asmElementType); lastVar = createLoopTempVariable(asmElementType);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(asmElementType);
}
});
gen(rangeCall.right, asmElementType); gen(rangeCall.right, asmElementType);
v.store(lastVar, asmElementType); v.store(lastVar, asmElementType);
} }
@@ -947,24 +922,12 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
gen(forExpression.getLoopRange(), asmLoopRangeType); gen(forExpression.getLoopRange(), asmLoopRangeType);
v.dup(); v.dup();
indexVar = myFrameMap.enterTemp(Type.INT_TYPE); indexVar = createLoopTempVariable(Type.INT_TYPE);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(Type.INT_TYPE);
}
});
v.invokevirtual(JET_INT_RANGE_TYPE.getInternalName(), "getStart", "()Ljava/lang/Integer;"); v.invokevirtual(JET_INT_RANGE_TYPE.getInternalName(), "getStart", "()Ljava/lang/Integer;");
StackValue.coerce(Type.getType("Ljava/lang/Integer;"), Type.INT_TYPE, v); StackValue.coerce(Type.getType("Ljava/lang/Integer;"), Type.INT_TYPE, v);
v.store(indexVar, Type.INT_TYPE); v.store(indexVar, Type.INT_TYPE);
endVar = myFrameMap.enterTemp(Type.INT_TYPE); endVar = createLoopTempVariable(Type.INT_TYPE);
runAfterLoop(new Runnable() {
@Override
public void run() {
myFrameMap.leaveTemp(Type.INT_TYPE);
}
});
v.invokevirtual(JET_INT_RANGE_TYPE.getInternalName(), "getEnd", "()Ljava/lang/Integer;"); v.invokevirtual(JET_INT_RANGE_TYPE.getInternalName(), "getEnd", "()Ljava/lang/Integer;");
StackValue.coerce(Type.getType("Ljava/lang/Integer;"), Type.INT_TYPE, v); StackValue.coerce(Type.getType("Ljava/lang/Integer;"), Type.INT_TYPE, v);
v.store(endVar, Type.INT_TYPE); v.store(endVar, Type.INT_TYPE);