languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some lingering references to type propogation

Browse source 
Change-Id: I931ab74af0f31a0fc70463bc8e03c960306b7628
Reviewed-on: https://dart-review.googlesource.com/c/90280
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Auto-Submit: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Brian Wilkerson 2019-01-18 18:01:30 +00:00 committed by commit-bot@chromium.org
parent be47aad327
commit ebf319b64b
1 changed files with 0 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
pkg/analyzer/lib/src/generated/resolver.dart
View file

@ -4450,7 +4450,6 @@ class ResolverVisitor extends ScopedVisitor {
void visitAssertStatement(AssertStatement node) {
InferenceContext.setType(node.condition, typeProvider.boolType);
super.visitAssertStatement(node);
_propagateTrueState(node.condition);
}
@override
@ -4491,7 +4490,6 @@ class ResolverVisitor extends ScopedVisitor {
try {
_promoteManager.enterScope();
try {
_propagateTrueState(leftOperand);
// Type promotion.
_promoteTypes(leftOperand);
_clearTypePromotionsIfPotentiallyMutatedIn(leftOperand);
@ -4515,7 +4513,6 @@ class ResolverVisitor extends ScopedVisitor {
if (rightOperand != null) {
_overrideManager.enterScope();
try {
_propagateFalseState(leftOperand);
rightOperand.accept(this);
} finally {
_overrideManager.exitScope();
@ -4677,7 +4674,6 @@ class ResolverVisitor extends ScopedVisitor {
try {
_promoteManager.enterScope();
try {
_propagateTrueState(condition);
// Type promotion.
_promoteTypes(condition);
_clearTypePromotionsIfPotentiallyMutatedIn(thenExpression);
@ -4697,7 +4693,6 @@ class ResolverVisitor extends ScopedVisitor {
if (elseExpression != null) {
_overrideManager.enterScope();
try {
_propagateFalseState(condition);
InferenceContext.setTypeFromNode(elseExpression, node);
elseExpression.accept(this);
} finally {
@ -4706,15 +4701,6 @@ class ResolverVisitor extends ScopedVisitor {
}
node.accept(elementResolver);
node.accept(typeAnalyzer);
bool thenIsAbrupt = _isAbruptTerminationExpression(thenExpression);
bool elseIsAbrupt = _isAbruptTerminationExpression(elseExpression);
if (elseIsAbrupt && !thenIsAbrupt) {
_propagateTrueState(condition);
_propagateState(thenExpression);
} else if (thenIsAbrupt && !elseIsAbrupt) {
_propagateFalseState(condition);
_propagateState(elseExpression);
}
}
@override
@ -4984,7 +4970,6 @@ class ResolverVisitor extends ScopedVisitor {
node.condition?.accept(this);
_overrideManager.enterScope();
try {
_propagateTrueState(node.condition);
visitStatementInScope(node.body);
node.updaters.accept(this);
} finally {
@ -5101,7 +5086,6 @@ class ResolverVisitor extends ScopedVisitor {
try {
_promoteManager.enterScope();
try {
_propagateTrueState(condition);
// Type promotion.
_promoteTypes(condition);
_clearTypePromotionsIfPotentiallyMutatedIn(thenStatement);
@ -5123,7 +5107,6 @@ class ResolverVisitor extends ScopedVisitor {
if (elseStatement != null) {
_overrideManager.enterScope();
try {
_propagateFalseState(condition);
visitStatementInScope(elseStatement);
} finally {
elseOverrides = _overrideManager.captureLocalOverrides();
@ -5136,10 +5119,8 @@ class ResolverVisitor extends ScopedVisitor {
bool thenIsAbrupt = _isAbruptTerminationStatement(thenStatement);
bool elseIsAbrupt = _isAbruptTerminationStatement(elseStatement);
if (elseIsAbrupt && !thenIsAbrupt) {
_propagateTrueState(condition);
_overrideManager.applyOverrides(thenOverrides);
} else if (thenIsAbrupt && !elseIsAbrupt) {
_propagateFalseState(condition);
_overrideManager.applyOverrides(elseOverrides);
} else if (!thenIsAbrupt && !elseIsAbrupt) {
List<Map<VariableElement, DartType>> perBranchOverrides =
@ -5506,7 +5487,6 @@ class ResolverVisitor extends ScopedVisitor {
if (body != null) {
_overrideManager.enterScope();
try {
_propagateTrueState(condition);
visitStatementInScope(body);
} finally {
_overrideManager.exitScope();
@ -5963,53 +5943,6 @@ class ResolverVisitor extends ScopedVisitor {
}
}
/// Propagate any type information that results from knowing that the given
/// condition will have been evaluated to 'false'.
///
/// @param condition the condition that will have evaluated to 'false'
void _propagateFalseState(Expression condition) {
if (condition is BinaryExpression) {
if (condition.operator.type == TokenType.BAR_BAR) {
_propagateFalseState(condition.leftOperand);
_propagateFalseState(condition.rightOperand);
}
} else if (condition is PrefixExpression) {
if (condition.operator.type == TokenType.BANG) {
_propagateTrueState(condition.operand);
}
} else if (condition is ParenthesizedExpression) {
_propagateFalseState(condition.expression);
}
}
/// Propagate any type information that results from knowing that the given
/// expression will have been evaluated without altering the flow of
/// execution.
///
/// @param expression the expression that will have been evaluated
void _propagateState(Expression expression) {
// TODO(brianwilkerson) Implement this.
}
/// Propagate any type information that results from knowing that the given
/// condition will have been evaluated to 'true'.
///
/// @param condition the condition that will have evaluated to 'true'
void _propagateTrueState(Expression condition) {
if (condition is BinaryExpression) {
if (condition.operator.type == TokenType.AMPERSAND_AMPERSAND) {
_propagateTrueState(condition.leftOperand);
_propagateTrueState(condition.rightOperand);
}
} else if (condition is PrefixExpression) {
if (condition.operator.type == TokenType.BANG) {
_propagateFalseState(condition.operand);
}
} else if (condition is ParenthesizedExpression) {
_propagateTrueState(condition.expression);
}
}
/// Given an [argumentList] and the [parameters] related to the element that
/// will be invoked using those arguments, compute the list of parameters that
/// correspond to the list of arguments.