Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: sdk/lib/_internal/compiler/implementation/types/simple_types_inferrer.dart

Issue 23526020: Fix inferrer bug in the presence of compound assignments and unresolved fields in a generative cons… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/language/inferrer_this_access_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/types/simple_types_inferrer.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/types/simple_types_inferrer.dart (revision 27131)
+++ sdk/lib/_internal/compiler/implementation/types/simple_types_inferrer.dart (working copy)
@@ -1827,6 +1827,16 @@
});
}
+ bool get inInstanceContext {
+ return (outermostElement.isInstanceMember() && !outermostElement.isField())
+ || outermostElement.isGenerativeConstructor();
+ }
+
+ bool treatAsInstanceMember(Element element) {
+ return (Elements.isUnresolved(element) && inInstanceContext)
+ || (element != null && element.isInstanceMember());
+ }
+
T visitSendSet(SendSet node) {
Element element = elements[node];
if (!Elements.isUnresolved(element) && element.impliesType()) {
@@ -1845,14 +1855,14 @@
T receiverType;
bool isCallOnThis = false;
- if (node.receiver == null
- && element != null
- && element.isInstanceMember()) {
- receiverType = thisType;
- isCallOnThis = true;
+ if (node.receiver == null) {
+ if (treatAsInstanceMember(element)) {
+ receiverType = thisType;
+ isCallOnThis = true;
+ }
} else {
receiverType = visit(node.receiver);
- isCallOnThis = node.receiver != null && isThisOrSuper(node.receiver);
+ isCallOnThis = isThisOrSuper(node.receiver);
}
T rhsType;
@@ -1878,6 +1888,10 @@
if (!isThisExposed && isCallOnThis) {
checkIfExposesThis(
types.newTypedSelector(receiverType, setterSelector));
+ if (getterSelector != null) {
+ checkIfExposesThis(
+ types.newTypedSelector(receiverType, getterSelector));
+ }
}
}
@@ -1928,7 +1942,10 @@
}
T getterType;
T newType;
- if (Elements.isStaticOrTopLevelField(element)) {
+ if (Elements.isErroneousElement(element)) {
+ getterType = types.dynamicType;
+ newType = types.dynamicType;
+ } else if (Elements.isStaticOrTopLevelField(element)) {
Element getterElement = elements[node.selector];
getterType =
handleStaticSend(node, getterSelector, getterElement, null);
@@ -1990,7 +2007,9 @@
}
}
ArgumentsTypes arguments = new ArgumentsTypes<T>([rhsType], null);
- if (Elements.isStaticOrTopLevelField(element)) {
+ if (Elements.isErroneousElement(element)) {
+ // Code will always throw.
+ } else if (Elements.isStaticOrTopLevelField(element)) {
handleStaticSend(node, setterSelector, element, arguments);
} else if (Elements.isUnresolved(element) || element.isSetter()) {
handleDynamicSend(
@@ -2187,6 +2206,7 @@
T receiverType,
ArgumentsTypes arguments,
[CallSite constraint]) {
+ assert(receiverType != null);
if (selector.mask != receiverType) {
selector = (receiverType == types.dynamicType)
? selector.asUntyped
@@ -2218,8 +2238,10 @@
T receiverType;
bool isCallOnThis = false;
if (node.receiver == null) {
- isCallOnThis = true;
- receiverType = thisType;
+ if (treatAsInstanceMember(element)) {
+ isCallOnThis = true;
+ receiverType = thisType;
+ }
} else {
Node receiver = node.receiver;
isCallOnThis = isThisOrSuper(receiver);
« no previous file with comments | « no previous file | tests/language/inferrer_this_access_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698