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

Unified Diff: lib/src/checker/checker.dart

Issue 1361833002: Screen dynamic invokes to object properties in checker (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Handle object tearoffs better Created 5 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 | lib/src/checker/resolver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/checker/checker.dart
diff --git a/lib/src/checker/checker.dart b/lib/src/checker/checker.dart
index 888a79484cc4d68e30f2ce2b6d2c046b5a97b4a1..ddbb40224a47c2a0b94117945bdf3bce34606438 100644
--- a/lib/src/checker/checker.dart
+++ b/lib/src/checker/checker.dart
@@ -526,7 +526,8 @@ class CodeChecker extends RecursiveAstVisitor {
@override
visitMethodInvocation(MethodInvocation node) {
var target = node.realTarget;
- if (rules.isDynamicTarget(target)) {
+ if (rules.isDynamicTarget(target) &&
+ !_isObjectMethod(node, node.methodName)) {
_recordDynamicInvoke(node, target);
// Mark the tear-off as being dynamic, too. This lets us distinguish
@@ -610,7 +611,8 @@ class CodeChecker extends RecursiveAstVisitor {
@override
void visitPropertyAccess(PropertyAccess node) {
var target = node.realTarget;
- if (rules.isDynamicTarget(target)) {
+ if (rules.isDynamicTarget(target) &&
+ !_isObjectProperty(target, node.propertyName)) {
_recordDynamicInvoke(node, target);
}
node.visitChildren(this);
@@ -619,7 +621,8 @@ class CodeChecker extends RecursiveAstVisitor {
@override
void visitPrefixedIdentifier(PrefixedIdentifier node) {
final target = node.prefix;
- if (rules.isDynamicTarget(target)) {
+ if (rules.isDynamicTarget(target) &&
+ !_isObjectProperty(target, node.identifier)) {
_recordDynamicInvoke(node, target);
}
node.visitChildren(this);
@@ -920,6 +923,22 @@ class CodeChecker extends RecursiveAstVisitor {
}
}
+ bool _isObjectGetter(Expression target, SimpleIdentifier id) {
+ PropertyAccessorElement element =
+ rules.provider.objectType.element.getGetter(id.name);
+ return (element != null && !element.isStatic);
+ }
+
+ bool _isObjectMethod(Expression target, SimpleIdentifier id) {
+ MethodElement element =
+ rules.provider.objectType.element.getMethod(id.name);
+ return (element != null && !element.isStatic);
+ }
+
+ bool _isObjectProperty(Expression target, SimpleIdentifier id) {
+ return _isObjectGetter(target, id) || _isObjectMethod(target, id);
+ }
+
void _recordDynamicInvoke(AstNode node, AstNode target) {
reporter.onError(new DynamicInvoke(rules, node).toAnalysisError());
// TODO(jmesserly): we may eventually want to record if the whole operation
« no previous file with comments | « no previous file | lib/src/checker/resolver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698