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

Dead block removed (function literal inside do...while)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-04-23 18:18:21 +03:00
parent b40fe9d5ba
commit 8b241b8c05
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
+2 -12
View File
@@ -305,18 +305,8 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor {
// See KT-6283 // See KT-6283
JetTypeInfo bodyTypeInfo; JetTypeInfo bodyTypeInfo;
if (body instanceof JetFunctionLiteralExpression) { if (body instanceof JetFunctionLiteralExpression) {
JetFunctionLiteralExpression function = (JetFunctionLiteralExpression) body; // As a matter of fact, function literal is always unused at this point
JetFunctionLiteral functionLiteral = function.getFunctionLiteral(); bodyTypeInfo = facade.getTypeInfo(body, context.replaceScope(context.scope));
if (!functionLiteral.hasParameterSpecification()) {
WritableScope writableScope = newWritableScopeImpl(context, "do..while body scope");
conditionScope = writableScope;
bodyTypeInfo = components.expressionTypingServices.getBlockReturnedTypeWithWritableScope(
writableScope, functionLiteral.getBodyExpression().getStatements(), CoercionStrategy.NO_COERCION, context);
context.trace.record(BindingContext.BLOCK, function);
}
else {
bodyTypeInfo = facade.getTypeInfo(body, context.replaceScope(context.scope));
}
} }
else if (body != null) { else if (body != null) {
WritableScope writableScope = newWritableScopeImpl(context, "do..while body scope"); WritableScope writableScope = newWritableScopeImpl(context, "do..while body scope");