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

Side by Side Diff: pkg/compiler/lib/src/serialization/modelz.dart

Issue 2987783002: Additional fixes for invalid overrides in dart2js (Closed)
Patch Set: Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 /// Implementation of the element model used for deserialiation. 5 /// Implementation of the element model used for deserialiation.
6 /// 6 ///
7 /// These classes are created by [ElementDeserializer] triggered by the 7 /// These classes are created by [ElementDeserializer] triggered by the
8 /// [Deserializer]. 8 /// [Deserializer].
9 9
10 library dart2js.serialization.modelz; 10 library dart2js.serialization.modelz;
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 1032
1033 abstract class MixinApplicationElementMixin 1033 abstract class MixinApplicationElementMixin
1034 implements ElementZ, MixinApplicationElement { 1034 implements ElementZ, MixinApplicationElement {
1035 @override 1035 @override
1036 bool get isMixinApplication => true; 1036 bool get isMixinApplication => true;
1037 1037
1038 @override 1038 @override
1039 ClassElement get mixin => mixinType.element; 1039 ClassElement get mixin => mixinType.element;
1040 } 1040 }
1041 1041
1042 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1042 class NamedMixinApplicationElementZ extends ClassElementZ 1043 class NamedMixinApplicationElementZ extends ClassElementZ
1043 with MixinApplicationElementMixin { 1044 with MixinApplicationElementMixin {
1044 Link<Element> _constructors; 1045 Link<Element> _constructors;
1045 ResolutionInterfaceType _mixinType; 1046 ResolutionInterfaceType _mixinType;
1046 1047
1047 NamedMixinApplicationElementZ(ObjectDecoder decoder) : super(decoder); 1048 NamedMixinApplicationElementZ(ObjectDecoder decoder) : super(decoder);
1048 1049
1049 @override 1050 @override
1050 ResolutionInterfaceType get mixinType => 1051 ResolutionInterfaceType get mixinType =>
1051 _mixinType ??= _decoder.getType(Key.MIXIN); 1052 _mixinType ??= _decoder.getType(Key.MIXIN);
1052 1053
1053 @override 1054 @override
1054 ClassElement get subclass => null; 1055 ClassElement get subclass => null;
1055 } 1056 }
1056 1057
1058 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1057 class UnnamedMixinApplicationElementZ extends ElementZ 1059 class UnnamedMixinApplicationElementZ extends ElementZ
1058 with 1060 with
1059 ClassElementCommon, 1061 ClassElementCommon,
1060 ClassElementMixin, 1062 ClassElementMixin,
1061 class_members.ClassMemberMixin, 1063 class_members.ClassMemberMixin,
1062 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_MIXIN 1064 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_MIXIN
1063 TypeDeclarationMixin, 1065 TypeDeclarationMixin,
1064 AnalyzableElementMixin, 1066 AnalyzableElementMixin,
1065 AstElementMixinZ, 1067 AstElementMixinZ,
1066 MixinApplicationElementCommon, 1068 MixinApplicationElementCommon,
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 1317
1316 @override 1318 @override
1317 PrefixElement get redirectionDeferredPrefix => null; 1319 PrefixElement get redirectionDeferredPrefix => null;
1318 1320
1319 @override 1321 @override
1320 ResolutionDartType computeEffectiveTargetType( 1322 ResolutionDartType computeEffectiveTargetType(
1321 ResolutionInterfaceType newType) => 1323 ResolutionInterfaceType newType) =>
1322 newType; 1324 newType;
1323 } 1325 }
1324 1326
1327 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1325 class GenerativeConstructorElementZ extends ConstructorElementZ { 1328 class GenerativeConstructorElementZ extends ConstructorElementZ {
1326 GenerativeConstructorElementZ(ObjectDecoder decoder) : super(decoder); 1329 GenerativeConstructorElementZ(ObjectDecoder decoder) : super(decoder);
1327 1330
1328 @override 1331 @override
1329 ElementKind get kind => ElementKind.GENERATIVE_CONSTRUCTOR; 1332 ElementKind get kind => ElementKind.GENERATIVE_CONSTRUCTOR;
1330 1333
1331 @override 1334 @override
1332 bool get isRedirectingGenerative => _decoder.getBool(Key.IS_REDIRECTING); 1335 bool get isRedirectingGenerative => _decoder.getBool(Key.IS_REDIRECTING);
1333 } 1336 }
1334 1337
1338 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1335 class DefaultConstructorElementZ extends ConstructorElementZ { 1339 class DefaultConstructorElementZ extends ConstructorElementZ {
1336 DefaultConstructorElementZ(ObjectDecoder decoder) : super(decoder); 1340 DefaultConstructorElementZ(ObjectDecoder decoder) : super(decoder);
1337 1341
1338 @override 1342 @override
1339 ElementKind get kind => ElementKind.GENERATIVE_CONSTRUCTOR; 1343 ElementKind get kind => ElementKind.GENERATIVE_CONSTRUCTOR;
1340 1344
1341 @override 1345 @override
1342 bool get isSynthesized => true; 1346 bool get isSynthesized => true;
1343 1347
1344 @override 1348 @override
1345 bool get isDefaultConstructor => true; 1349 bool get isDefaultConstructor => true;
1346 1350
1347 @override 1351 @override
1348 ConstructorElement get definingConstructor { 1352 ConstructorElement get definingConstructor {
1349 return enclosingClass.superclass.lookupConstructor(''); 1353 return enclosingClass.superclass.lookupConstructor('');
1350 } 1354 }
1351 } 1355 }
1352 1356
1357 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1353 class FactoryConstructorElementZ extends ConstructorElementZ { 1358 class FactoryConstructorElementZ extends ConstructorElementZ {
1354 FactoryConstructorElementZ(ObjectDecoder decoder) : super(decoder); 1359 FactoryConstructorElementZ(ObjectDecoder decoder) : super(decoder);
1355 1360
1356 @override 1361 @override
1357 ElementKind get kind => ElementKind.FACTORY_CONSTRUCTOR; 1362 ElementKind get kind => ElementKind.FACTORY_CONSTRUCTOR;
1358 } 1363 }
1359 1364
1365 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1360 class RedirectingFactoryConstructorElementZ extends ConstructorElementZ { 1366 class RedirectingFactoryConstructorElementZ extends ConstructorElementZ {
1361 ResolutionDartType _effectiveTargetType; 1367 ResolutionDartType _effectiveTargetType;
1362 ConstructorElement _immediateRedirectionTarget; 1368 ConstructorElement _immediateRedirectionTarget;
1363 PrefixElement _redirectionDeferredPrefix; 1369 PrefixElement _redirectionDeferredPrefix;
1364 bool _effectiveTargetIsMalformed; 1370 bool _effectiveTargetIsMalformed;
1365 1371
1366 RedirectingFactoryConstructorElementZ(ObjectDecoder decoder) : super(decoder); 1372 RedirectingFactoryConstructorElementZ(ObjectDecoder decoder) : super(decoder);
1367 1373
1368 @override 1374 @override
1369 ElementKind get kind => ElementKind.FACTORY_CONSTRUCTOR; 1375 ElementKind get kind => ElementKind.FACTORY_CONSTRUCTOR;
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1688 return _decoder.getEnum(Key.ASYNC_MARKER, AsyncMarker.values); 1694 return _decoder.getEnum(Key.ASYNC_MARKER, AsyncMarker.values);
1689 } 1695 }
1690 1696
1691 @override 1697 @override
1692 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT); 1698 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT);
1693 1699
1694 @override 1700 @override
1695 bool get isOperator => _decoder.getBool(Key.IS_OPERATOR); 1701 bool get isOperator => _decoder.getBool(Key.IS_OPERATOR);
1696 } 1702 }
1697 1703
1704 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1698 class TopLevelFunctionElementZ extends FunctionElementZ 1705 class TopLevelFunctionElementZ extends FunctionElementZ
1699 with LibraryMemberMixin { 1706 with LibraryMemberMixin {
1700 TopLevelFunctionElementZ(ObjectDecoder decoder) : super(decoder); 1707 TopLevelFunctionElementZ(ObjectDecoder decoder) : super(decoder);
1701 } 1708 }
1702 1709
1710 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1703 class StaticFunctionElementZ extends FunctionElementZ 1711 class StaticFunctionElementZ extends FunctionElementZ
1704 with ClassMemberMixin, StaticMemberMixin { 1712 with ClassMemberMixin, StaticMemberMixin {
1705 StaticFunctionElementZ(ObjectDecoder decoder) : super(decoder); 1713 StaticFunctionElementZ(ObjectDecoder decoder) : super(decoder);
1706 } 1714 }
1707 1715
1716 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1708 class InstanceFunctionElementZ extends FunctionElementZ 1717 class InstanceFunctionElementZ extends FunctionElementZ
1709 with ClassMemberMixin, InstanceMemberMixin { 1718 with ClassMemberMixin, InstanceMemberMixin {
1710 InstanceFunctionElementZ(ObjectDecoder decoder) : super(decoder); 1719 InstanceFunctionElementZ(ObjectDecoder decoder) : super(decoder);
1711 } 1720 }
1712 1721
1713 abstract class LocalExecutableMixin 1722 abstract class LocalExecutableMixin
1714 implements DeserializedElementZ, ExecutableElement, LocalElement { 1723 implements DeserializedElementZ, ExecutableElement, LocalElement {
1715 ExecutableElement _executableContext; 1724 ExecutableElement _executableContext;
1716 1725
1717 @override 1726 @override
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1801 1810
1802 @override 1811 @override
1803 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT); 1812 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT);
1804 1813
1805 @override 1814 @override
1806 AsyncMarker get asyncMarker { 1815 AsyncMarker get asyncMarker {
1807 return _decoder.getEnum(Key.ASYNC_MARKER, AsyncMarker.values); 1816 return _decoder.getEnum(Key.ASYNC_MARKER, AsyncMarker.values);
1808 } 1817 }
1809 } 1818 }
1810 1819
1820 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1811 class TopLevelGetterElementZ extends GetterElementZ with LibraryMemberMixin { 1821 class TopLevelGetterElementZ extends GetterElementZ with LibraryMemberMixin {
1812 TopLevelGetterElementZ(ObjectDecoder decoder) : super(decoder); 1822 TopLevelGetterElementZ(ObjectDecoder decoder) : super(decoder);
1813 } 1823 }
1814 1824
1825 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1815 class StaticGetterElementZ extends GetterElementZ 1826 class StaticGetterElementZ extends GetterElementZ
1816 with ClassMemberMixin, StaticMemberMixin { 1827 with ClassMemberMixin, StaticMemberMixin {
1817 StaticGetterElementZ(ObjectDecoder decoder) : super(decoder); 1828 StaticGetterElementZ(ObjectDecoder decoder) : super(decoder);
1818 } 1829 }
1819 1830
1831 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1820 class InstanceGetterElementZ extends GetterElementZ 1832 class InstanceGetterElementZ extends GetterElementZ
1821 with ClassMemberMixin, InstanceMemberMixin { 1833 with ClassMemberMixin, InstanceMemberMixin {
1822 InstanceGetterElementZ(ObjectDecoder decoder) : super(decoder); 1834 InstanceGetterElementZ(ObjectDecoder decoder) : super(decoder);
1823 } 1835 }
1824 1836
1825 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE 1837 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1826 abstract class SetterElementZ extends DeserializedElementZ 1838 abstract class SetterElementZ extends DeserializedElementZ
1827 with 1839 with
1828 AnalyzableElementMixin, 1840 AnalyzableElementMixin,
1829 AstElementMixinZ<FunctionExpression>, 1841 AstElementMixinZ<FunctionExpression>,
(...skipping 15 matching lines...) Expand all
1845 return visitor.visitSetterElement(this, arg); 1857 return visitor.visitSetterElement(this, arg);
1846 } 1858 }
1847 1859
1848 @override 1860 @override
1849 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT); 1861 bool get isAbstract => _decoder.getBool(Key.IS_ABSTRACT);
1850 1862
1851 @override 1863 @override
1852 AsyncMarker get asyncMarker => AsyncMarker.SYNC; 1864 AsyncMarker get asyncMarker => AsyncMarker.SYNC;
1853 } 1865 }
1854 1866
1867 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1855 class TopLevelSetterElementZ extends SetterElementZ with LibraryMemberMixin { 1868 class TopLevelSetterElementZ extends SetterElementZ with LibraryMemberMixin {
1856 TopLevelSetterElementZ(ObjectDecoder decoder) : super(decoder); 1869 TopLevelSetterElementZ(ObjectDecoder decoder) : super(decoder);
1857 } 1870 }
1858 1871
1872 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1859 class StaticSetterElementZ extends SetterElementZ 1873 class StaticSetterElementZ extends SetterElementZ
1860 with ClassMemberMixin, StaticMemberMixin { 1874 with ClassMemberMixin, StaticMemberMixin {
1861 StaticSetterElementZ(ObjectDecoder decoder) : super(decoder); 1875 StaticSetterElementZ(ObjectDecoder decoder) : super(decoder);
1862 } 1876 }
1863 1877
1878 // ignore: STRONG_MODE_INVALID_METHOD_OVERRIDE_FROM_BASE
1864 class InstanceSetterElementZ extends SetterElementZ 1879 class InstanceSetterElementZ extends SetterElementZ
1865 with ClassMemberMixin, InstanceMemberMixin { 1880 with ClassMemberMixin, InstanceMemberMixin {
1866 InstanceSetterElementZ(ObjectDecoder decoder) : super(decoder); 1881 InstanceSetterElementZ(ObjectDecoder decoder) : super(decoder);
1867 } 1882 }
1868 1883
1869 abstract class TypeDeclarationMixin 1884 abstract class TypeDeclarationMixin
1870 implements ElementZ, TypeDeclarationElement { 1885 implements ElementZ, TypeDeclarationElement {
1871 List<ResolutionDartType> _typeVariables; 1886 List<ResolutionDartType> _typeVariables;
1872 GenericType _rawType; 1887 GenericType _rawType;
1873 GenericType _thisType; 1888 GenericType _thisType;
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
2443 } 2458 }
2444 2459
2445 @override 2460 @override
2446 Node get node => throw new UnsupportedError('${this}.node'); 2461 Node get node => throw new UnsupportedError('${this}.node');
2447 2462
2448 @override 2463 @override
2449 bool get hasNode => false; 2464 bool get hasNode => false;
2450 2465
2451 String toString() => 'MetadataAnnotationZ(${constant.toDartText()})'; 2466 String toString() => 'MetadataAnnotationZ(${constant.toDartText()})';
2452 } 2467 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698