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

Unified Diff: pkg/compiler/lib/src/universe/selector.dart

Issue 2810683002: Use entities in Selector methods (Closed)
Patch Set: Created 3 years, 8 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 | « pkg/compiler/lib/src/universe/codegen_world_builder.dart ('k') | pkg/compiler/lib/src/world.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/universe/selector.dart
diff --git a/pkg/compiler/lib/src/universe/selector.dart b/pkg/compiler/lib/src/universe/selector.dart
index 187f1db151def7c818abb4dea38ed7388da34442..00ebc0ba2874389a865909f47f786a26223f1eda 100644
--- a/pkg/compiler/lib/src/universe/selector.dart
+++ b/pkg/compiler/lib/src/universe/selector.dart
@@ -7,14 +7,7 @@ library dart2js.selector;
import '../common.dart';
import '../common/names.dart' show Names;
import '../elements/elements.dart'
- show
- Element,
- Elements,
- FunctionSignature,
- MemberElement,
- MethodElement,
- Name,
- PublicName;
+ show Element, Elements, FunctionSignature, Name, PublicName;
import '../elements/entities.dart';
import '../util/util.dart' show Hashing;
import 'call_structure.dart' show CallStructure;
@@ -217,14 +210,13 @@ class Selector {
return kind;
}
- bool appliesUnnamed(MemberElement element) {
+ bool appliesUnnamed(MemberEntity element) {
assert(name == element.name);
return appliesUntyped(element);
}
- bool appliesUntyped(MemberElement element) {
+ bool appliesUntyped(MemberEntity element) {
assert(name == element.name);
- if (Elements.isUnresolved(element)) return false;
if (memberName.isPrivate && memberName.library != element.library) {
// TODO(johnniwinther): Maybe this should be
// `memberName != element.memberName`.
@@ -233,20 +225,18 @@ class Selector {
if (element.isSetter) return isSetter;
if (element.isGetter) return isGetter || isCall;
if (element.isField) {
- return isSetter
- ? !element.isFinal && !element.isConst
- : isGetter || isCall;
+ return isSetter ? element.isAssignable : isGetter || isCall;
}
if (isGetter) return true;
if (isSetter) return false;
return signatureApplies(element);
}
- bool signatureApplies(MethodElement function) {
+ bool signatureApplies(FunctionEntity function) {
return callStructure.signatureApplies(function.parameterStructure);
}
- bool applies(MemberElement element) {
+ bool applies(MemberEntity element) {
if (name != element.name) return false;
return appliesUnnamed(element);
}
« no previous file with comments | « pkg/compiler/lib/src/universe/codegen_world_builder.dart ('k') | pkg/compiler/lib/src/world.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698