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

Unified Diff: sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart

Issue 11860008: Stop passing library elements to tons of namer functions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Diff against https://codereview.chromium.org/11819060/. Created 7 years, 11 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
Index: sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
index 1e51d816d196793a009bfdcc4a0f47a0f49cded1..52e73c5bf8cd7542be6dcb8e305cbe395b95dd27 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
@@ -464,9 +464,7 @@ $lazyInitializerLogic
ConstantHandler handler = compiler.constantHandler;
List<SourceString> names = selector.getOrderedNamedArguments();
- String invocationName =
- namer.instanceMethodInvocationName(member.getLibrary(), member.name,
- selector);
+ String invocationName = namer.invocationName(selector);
if (alreadyGenerated.contains(invocationName)) return;
alreadyGenerated.add(invocationName);
@@ -1086,16 +1084,11 @@ $lazyInitializerLogic
List<js.Expression> arguments = <js.Expression>[];
parameters.add(new js.Parameter('receiver'));
- String name;
- if (selector.isGetter()) {
- name = backend.namer.getterName(selector.library, selector.name);
- } else if (selector.isSetter()) {
- name = backend.namer.setterName(selector.library, selector.name);
+ String name = backend.namer.invocationName(selector);
+ if (selector.isSetter()) {
parameters.add(new js.Parameter('value'));
arguments.add(new js.VariableUse('value'));
} else {
- name = backend.namer.instanceMethodInvocationName(
- selector.library, selector.name, selector);
for (int i = 0; i < selector.argumentCount; i++) {
String argName = 'a$i';
parameters.add(new js.Parameter(argName));
@@ -1489,7 +1482,7 @@ $lazyInitializerLogic
}
// And finally the getter.
- String getterName = namer.getterName(member.getLibrary(), member.name);
+ String getterName = namer.getterName(member);
String targetName = namer.instanceMethodName(member);
List<js.Parameter> parameters = <js.Parameter>[];
@@ -1533,7 +1526,7 @@ $lazyInitializerLogic
js.Expression buildGetter() {
if (member.isGetter()) {
- String getterName = namer.getterName(member.getLibrary(), member.name);
+ String getterName = namer.getterName(member);
return new js.VariableUse('this').dot(getterName).callWith(
isInterceptorClass
? <js.Expression>[new js.VariableUse(receiverArgumentName)]
@@ -1541,20 +1534,16 @@ $lazyInitializerLogic
} else {
String fieldName = member.hasFixedBackendName()
? member.fixedBackendName()
- : namer.instanceFieldName(memberLibrary, member.name);
+ : namer.instanceFieldName(member);
return new js.VariableUse('this').dot(fieldName);
}
}
for (Selector selector in selectors) {
if (selector.applies(member, compiler)) {
- String invocationName =
- namer.instanceMethodInvocationName(memberLibrary, member.name,
- selector);
- SourceString callName = namer.closureInvocationSelectorName;
- String closureCallName =
- namer.instanceMethodInvocationName(memberLibrary, callName,
- selector);
+ String invocationName = namer.invocationName(selector);
+ Selector callSelector = new Selector.callClosureFrom(selector);
+ String closureCallName = namer.invocationName(callSelector);
List<js.Parameter> parameters = <js.Parameter>[];
List<js.Expression> arguments = <js.Expression>[];
@@ -1878,7 +1867,7 @@ $lazyInitializerLogic
// the isolate method, we must make sure that it exists.
if (!compiler.codegenWorld.staticFunctionsNeedingGetter.contains(appMain)) {
Selector selector = new Selector.callClosure(0);
- String invocationName = "${namer.closureInvocationName(selector)}";
+ String invocationName = namer.invocationName(selector);
buffer.add("$mainAccess.$invocationName = $mainAccess");
}
return "${namer.isolateAccess(isolateMain)}($mainAccess)";

Powered by Google App Engine
This is Rietveld 408576698