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

Minor. Cleanup block codegen

Browse Source 
- Clarify variable names
- Use explicit condition 'statements.isEmpty()' instead of implicit one 'answer == null'
This commit is contained in:
Denis Zharkov
2016-08-31 12:57:01 +03:00
parent 2ab553243c
commit 12dad29336
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+18 -11
View File
@@ -1760,7 +1760,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
final List<Function<StackValue, Void>> leaveTasks = Lists.newArrayList(); final List<Function<StackValue, Void>> leaveTasks = Lists.newArrayList();
@Nullable @Nullable
StackValue answer = null; StackValue blockResult = null;
for (Iterator<KtExpression> iterator = statements.iterator(); iterator.hasNext(); ) { for (Iterator<KtExpression> iterator = statements.iterator(); iterator.hasNext(); ) {
KtExpression possiblyLabeledStatement = iterator.next(); KtExpression possiblyLabeledStatement = iterator.next();
@@ -1781,32 +1781,39 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
v.mark(labelBeforeLastExpression); v.mark(labelBeforeLastExpression);
} }
// Note that this result value is potentially unused (in case of handleResult coroutine call) // Note that this statementResult value is potentially unused (in case of handleResult coroutine call)
// It's supposed here that no bytecode is emitted until 'put' call on relevant StackValue object // It's supposed here that no bytecode is emitted until 'put' call on relevant StackValue object
StackValue result = isExpression ? gen(possiblyLabeledStatement) : genStatement(possiblyLabeledStatement); StackValue statementResult = isExpression ? gen(possiblyLabeledStatement) : genStatement(possiblyLabeledStatement);
if (!iterator.hasNext()) { if (!iterator.hasNext()) {
answer = result;
StackValue handleResultValue = genControllerHandleResultForLastStatementInCoroutine(block, possiblyLabeledStatement); StackValue handleResultValue = genControllerHandleResultForLastStatementInCoroutine(block, possiblyLabeledStatement);
if (handleResultValue != null) { if (handleResultValue != null) {
answer = handleResultValue; blockResult = handleResultValue;
}
else {
blockResult = statementResult;
} }
} }
else { else {
result.put(Type.VOID_TYPE, v); statementResult.put(Type.VOID_TYPE, v);
} }
addLeaveTaskToRemoveDescriptorFromFrameMap(statement, blockEnd, leaveTasks); addLeaveTaskToRemoveDescriptorFromFrameMap(statement, blockEnd, leaveTasks);
} }
if (answer == null) { if (statements.isEmpty()) {
answer = genControllerHandleResultForLastStatementInCoroutine(block, null); StackValue handleResultValue = genControllerHandleResultForLastStatementInCoroutine(block, null);
if (answer == null) { if (handleResultValue != null) {
answer = StackValue.none(); blockResult = handleResultValue;
}
else {
blockResult = StackValue.none();
} }
} }
return new StackValueWithLeaveTask(answer, new Function1<StackValue, Unit>() { assert blockResult != null : "Block result should be initialized in the loop or the condition above";
return new StackValueWithLeaveTask(blockResult, new Function1<StackValue, Unit>() {
@Override @Override
public Unit invoke(StackValue value) { public Unit invoke(StackValue value) {
if (labelBlockEnd == null) { if (labelBlockEnd == null) {