OLD | NEW |
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 library dart2js.serialization_test; | 5 library dart2js.serialization_test; |
6 | 6 |
7 import 'dart:io'; | 7 import 'dart:io'; |
8 import '../memory_compiler.dart'; | 8 import '../memory_compiler.dart'; |
9 import 'package:async_helper/async_helper.dart'; | 9 import 'package:async_helper/async_helper.dart'; |
10 import 'package:compiler/src/commandline_options.dart'; | 10 import 'package:compiler/src/commandline_options.dart'; |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 element1.isRedirectingFactory, element2.isRedirectingFactory); | 565 element1.isRedirectingFactory, element2.isRedirectingFactory); |
566 checkElementIdentities(element1, element2, 'effectiveTarget', | 566 checkElementIdentities(element1, element2, 'effectiveTarget', |
567 element1.effectiveTarget, element2.effectiveTarget); | 567 element1.effectiveTarget, element2.effectiveTarget); |
568 checkElementIdentities(element1, element2, 'definingConstructor', | 568 checkElementIdentities(element1, element2, 'definingConstructor', |
569 element1.definingConstructor, element2.definingConstructor); | 569 element1.definingConstructor, element2.definingConstructor); |
570 check( | 570 check( |
571 element1, element2, 'effectiveTargetType', | 571 element1, element2, 'effectiveTargetType', |
572 element1.computeEffectiveTargetType(element1.enclosingClass.thisType), | 572 element1.computeEffectiveTargetType(element1.enclosingClass.thisType), |
573 element2.computeEffectiveTargetType(element2.enclosingClass.thisType), | 573 element2.computeEffectiveTargetType(element2.enclosingClass.thisType), |
574 areTypesEquivalent); | 574 areTypesEquivalent); |
| 575 check( |
| 576 element1, element2, 'effectiveTargetType', |
| 577 element1.computeEffectiveTargetType(element1.enclosingClass.rawType), |
| 578 element2.computeEffectiveTargetType(element2.enclosingClass.rawType), |
| 579 areTypesEquivalent); |
575 checkElementIdentities(element1, element2, 'immediateRedirectionTarget', | 580 checkElementIdentities(element1, element2, 'immediateRedirectionTarget', |
576 element1.immediateRedirectionTarget, | 581 element1.immediateRedirectionTarget, |
577 element2.immediateRedirectionTarget); | 582 element2.immediateRedirectionTarget); |
578 checkElementIdentities(element1, element2, 'redirectionDeferredPrefix', | 583 checkElementIdentities(element1, element2, 'redirectionDeferredPrefix', |
579 element1.redirectionDeferredPrefix, element2.redirectionDeferredPrefix); | 584 element1.redirectionDeferredPrefix, element2.redirectionDeferredPrefix); |
580 } | 585 } |
581 | 586 |
582 @override | 587 @override |
583 void visitAbstractFieldElement(AbstractFieldElement element1, | 588 void visitAbstractFieldElement(AbstractFieldElement element1, |
584 AbstractFieldElement element2) { | 589 AbstractFieldElement element2) { |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
689 void visitPrefixElement(PrefixElement element1, PrefixElement element2) { | 694 void visitPrefixElement(PrefixElement element1, PrefixElement element2) { |
690 check( | 695 check( |
691 element1, element2, 'isDeferred', | 696 element1, element2, 'isDeferred', |
692 element1.isDeferred, element2.isDeferred); | 697 element1.isDeferred, element2.isDeferred); |
693 checkElementIdentities( | 698 checkElementIdentities( |
694 element1, element2, 'importedLibrary', | 699 element1, element2, 'importedLibrary', |
695 element1.deferredImport, element2.deferredImport); | 700 element1.deferredImport, element2.deferredImport); |
696 // TODO(johnniwinther): Check members. | 701 // TODO(johnniwinther): Check members. |
697 } | 702 } |
698 } | 703 } |
OLD | NEW |