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

Unified Diff: pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart

Issue 2929143002: Handle instance fields in compile_from_dill_test (Closed)
Patch Set: Cleanup Created 3 years, 6 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: pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
index f2130162300fcb8c7b5ec9c6f01513ede46e1ae5..f1fbe6df79052d04964fb89d3731fca2e411b38c 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
@@ -18,10 +18,8 @@ import '../../elements/elements.dart'
show
ClassElement,
ConstructorBodyElement,
- Element,
Elements,
FieldElement,
- FunctionElement,
FunctionSignature,
GetterElement,
LibraryElement,
@@ -521,7 +519,7 @@ class ProgramBuilder {
if (_nativeData.isJsInteropClass(cls)) {
// TODO(johnniwinther): Handle class entities.
ClassElement e = cls;
- e.declaration.forEachMember((_, Element member) {
+ e.declaration.forEachMember((_, MemberElement member) {
var jsName = _nativeData.computeUnescapedJSInteropName(member.name);
if (!member.isInstanceMember) return;
if (member.isGetter || member.isField || member.isFunction) {
@@ -543,7 +541,7 @@ class ProgramBuilder {
var selectors =
_worldBuilder.setterInvocationsByName(member.name);
if (selectors != null && !selectors.isEmpty) {
- var stubName = _namer.setterForElement(member);
+ var stubName = _namer.setterForMember(member);
if (stubNames.add(stubName.key)) {
interceptorClass.callStubs.add(_buildStubMethod(stubName,
js.js('function(obj, v) { return obj.# = v }', [jsName]),
@@ -558,7 +556,7 @@ class ProgramBuilder {
ResolutionFunctionType functionType = null;
if (member.isFunction) {
- FunctionElement fn = member;
+ MethodElement fn = member;
functionType = fn.type;
} else if (member.isGetter) {
if (_options.trustTypeAnnotations) {
@@ -1044,9 +1042,9 @@ class ProgramBuilder {
ClassEntity cls}) {
List<Field> fields = <Field>[];
- void visitField(FieldElement field, js.Name name, js.Name accessorName,
+ void visitField(FieldEntity field, js.Name name, js.Name accessorName,
bool needsGetter, bool needsSetter, bool needsCheckedSetter) {
- assert(field.isDeclaration, failedAt(field));
+ assert(!(field is FieldElement && !field.isDeclaration), failedAt(field));
int getterFlags = 0;
if (needsGetter) {
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/metadata_collector.dart ('k') | pkg/compiler/lib/src/kernel/kernel_backend_strategy.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698