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

Unified Diff: sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart

Issue 693883003: Encode super calls via extra properties on prototypes. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix handling of [Object] and stubs generation. Created 6 years, 1 month 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_emitter/old_emitter/container_builder.dart
diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart
index 802887d9b73b5bb69d124378c73a37b1a6fa380f..6fa8fa44b0f86b69b7404c1edc2ad2e3489e6053 100644
--- a/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_emitter/old_emitter/container_builder.dart
@@ -414,7 +414,7 @@ class ContainerBuilder extends CodeEmitterHelper {
void addMemberMethodFromInfo(MemberInfo info, ClassBuilder builder) {
final FunctionElement member = info.member;
- final String name = info.name;
+ String name = info.name;
final FunctionSignature parameters = info.parameters;
jsAst.Expression code = info.code;
final bool needsStubs = info.needsStubs;
@@ -427,6 +427,13 @@ class ContainerBuilder extends CodeEmitterHelper {
emitter.interceptorEmitter.recordMangledNameOfMemberMethod(member, name);
+ // If this member is called from a subclass via super, we have to add a
+ // renaming. This is encoded by using two names separated with a : as
+ // the property name.
+ if (backend.isAliasedSuperMember(member)) {
+ name = "$name:${namer.getNameOfAliasedSuperMember(member)}";
+ }
+
if (!needStructuredInfo) {
compiler.dumpInfoTask.registerElementAst(member,
builder.addProperty(name, code));

Powered by Google App Engine
This is Rietveld 408576698