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

There is only one way to know element types

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-23 20:07:11 +04:00
parent edbc832861
commit c822ce0d67
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+14 -11
View File
@@ -446,14 +446,23 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
private final Label bodyEnd = new Label(); private final Label bodyEnd = new Label();
private final List<Runnable> leaveVariableTasks = Lists.newArrayList(); private final List<Runnable> leaveVariableTasks = Lists.newArrayList();
private final JetType elementType;
private AbstractForLoopGenerator( private AbstractForLoopGenerator(
@NotNull JetForExpression forExpression @NotNull JetForExpression forExpression
) { ) {
this.forExpression = forExpression; this.forExpression = forExpression;
this.elementType = getElementType(forExpression);
} }
@NotNull @NotNull
protected abstract JetType getElementType(); private JetType getElementType(JetForExpression forExpression) {
JetExpression loopRange = forExpression.getLoopRange();
ResolvedCall<FunctionDescriptor> nextCall = getNotNull(bindingContext,
LOOP_RANGE_NEXT_RESOLVED_CALL, loopRange,
"No next() function " + DiagnosticUtils.atLocation(loopRange));
return nextCall.getResultingDescriptor().getReturnType();
}
@Override @Override
public void beforeBody() { public void beforeBody() {
@@ -481,7 +490,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
assert multiParameter != null; assert multiParameter != null;
// E tmp<e> = tmp<iterator>.next() // E tmp<e> = tmp<iterator>.next()
final Type asmElementType = asmType(getElementType()); final Type asmElementType = asmType(elementType);
int tmpParameterIndex = myFrameMap.enterTemp(asmElementType); int tmpParameterIndex = myFrameMap.enterTemp(asmElementType);
leaveVariableTasks.add(new Runnable() { leaveVariableTasks.add(new Runnable() {
@Override @Override
@@ -498,7 +507,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
protected abstract void assignToLoopParameter(int parameterIndex); protected abstract void assignToLoopParameter(int parameterIndex);
private void generateMultiVariables(int tmpParameterIndex, List<JetMultiDeclarationEntry> entries) { private void generateMultiVariables(int tmpParameterIndex, List<JetMultiDeclarationEntry> entries) {
Type asmElementType = asmType(getElementType()); 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);
@@ -518,7 +527,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
ResolvedCall<FunctionDescriptor> resolvedCall = bindingContext.get(BindingContext.COMPONENT_RESOLVED_CALL, variableDeclaration); ResolvedCall<FunctionDescriptor> resolvedCall = bindingContext.get(BindingContext.COMPONENT_RESOLVED_CALL, variableDeclaration);
assert resolvedCall != null : "Resolved call is null for " + variableDeclaration.getText(); assert resolvedCall != null : "Resolved call is null for " + variableDeclaration.getText();
Call call = makeFakeCall(new TransientReceiver(getElementType())); Call call = makeFakeCall(new TransientReceiver(elementType));
invokeFunction(call, StackValue.local(tmpParameterIndex, asmElementType), resolvedCall); invokeFunction(call, StackValue.local(tmpParameterIndex, asmElementType), resolvedCall);
v.store(componentVarIndex, componentAsmType); v.store(componentVarIndex, componentAsmType);
@@ -559,12 +568,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
"No next() function " + DiagnosticUtils.atLocation(loopRange)); "No next() function " + DiagnosticUtils.atLocation(loopRange));
} }
@NotNull
@Override
protected JetType getElementType() {
return nextCall.getResultingDescriptor().getReturnType();
}
@Override @Override
public void beforeLoop() { public void beforeLoop() {
// Iterator<E> tmp<iterator> = c.iterator() // Iterator<E> tmp<iterator> = c.iterator()
@@ -599,7 +602,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
Call fakeCall = Call fakeCall =
makeFakeCall(new TransientReceiver(iteratorCall.getResultingDescriptor().getReturnType())); makeFakeCall(new TransientReceiver(iteratorCall.getResultingDescriptor().getReturnType()));
invokeFunction(fakeCall, StackValue.local(iteratorVarIndex, asmTypeForIterator), nextCall); invokeFunction(fakeCall, StackValue.local(iteratorVarIndex, asmTypeForIterator), nextCall);
v.store(parameterIndex, asmType(getElementType())); v.store(parameterIndex, asmType(nextCall.getResultingDescriptor().getReturnType()));
} }
@Override @Override