| Index: pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| diff --git a/pkg/compiler/lib/src/js_backend/backend_helpers.dart b/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| index f85e9d08152583fe2364b1fbe8677dbb3e7cda94..104c2a0660e2c46b086e9a948fd3e27837a3e190 100644
|
| --- a/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| +++ b/pkg/compiler/lib/src/js_backend/backend_helpers.dart
|
| @@ -16,8 +16,10 @@ import '../elements/elements.dart'
|
| ConstructorElement,
|
| Element,
|
| EnumClassElement,
|
| + FieldElement,
|
| FunctionElement,
|
| LibraryElement,
|
| + MemberElement,
|
| MethodElement,
|
| PublicName;
|
| import '../library_loader.dart' show LoadedLibraries;
|
| @@ -100,11 +102,11 @@ class BackendHelpers {
|
| ClassElement jsUInt32Class;
|
| ClassElement jsUInt31Class;
|
|
|
| - Element jsIndexableLength;
|
| + MemberElement jsIndexableLength;
|
| Element jsArrayTypedConstructor;
|
| - Element jsArrayRemoveLast;
|
| - Element jsArrayAdd;
|
| - Element jsStringSplit;
|
| + MethodElement jsArrayRemoveLast;
|
| + MethodElement jsArrayAdd;
|
| + MethodElement jsStringSplit;
|
| Element jsStringToString;
|
| Element jsStringOperatorAdd;
|
| Element objectEquals;
|
| @@ -366,10 +368,14 @@ class BackendHelpers {
|
| }
|
|
|
| jsIndexableClass.ensureResolved(resolution);
|
| - jsIndexableLength = compiler.lookupElementIn(jsIndexableClass, 'length');
|
| - if (jsIndexableLength != null && jsIndexableLength.isAbstractField) {
|
| - AbstractFieldElement element = jsIndexableLength;
|
| + Element jsIndexableLengthElement =
|
| + compiler.lookupElementIn(jsIndexableClass, 'length');
|
| + if (jsIndexableLengthElement != null &&
|
| + jsIndexableLengthElement.isAbstractField) {
|
| + AbstractFieldElement element = jsIndexableLengthElement;
|
| jsIndexableLength = element.getter;
|
| + } else {
|
| + jsIndexableLength = jsIndexableLengthElement;
|
| }
|
|
|
| jsArrayClass.ensureResolved(resolution);
|
| @@ -397,7 +403,7 @@ class BackendHelpers {
|
| return findHelper('mainHasTooManyParameters');
|
| }
|
|
|
| - Element get loadLibraryWrapper {
|
| + MethodElement get loadLibraryWrapper {
|
| return findHelper("_loadLibraryWrapper");
|
| }
|
|
|
|
|