| 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_model_test; | 5 library dart2js.serialization_model_test; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'package:async_helper/async_helper.dart'; | 8 import 'package:async_helper/async_helper.dart'; |
| 9 import 'package:expect/expect.dart'; | 9 import 'package:expect/expect.dart'; |
| 10 import 'package:compiler/src/closure.dart'; | 10 import 'package:compiler/src/closure.dart'; |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 | 155 |
| 156 void checkElements( | 156 void checkElements( |
| 157 Compiler compiler1, Compiler compiler2, Element element1, Element element2, | 157 Compiler compiler1, Compiler compiler2, Element element1, Element element2, |
| 158 {bool verbose: false}) { | 158 {bool verbose: false}) { |
| 159 if (element1.isAbstract) return; | 159 if (element1.isAbstract) return; |
| 160 if (element1.isFunction || | 160 if (element1.isFunction || |
| 161 element1.isConstructor || | 161 element1.isConstructor || |
| 162 (element1.isField && element1.isInstanceMember)) { | 162 (element1.isField && element1.isInstanceMember)) { |
| 163 ClosureRepresentationInfo closureData1 = | 163 ClosureRepresentationInfo closureData1 = |
| 164 compiler1.closureToClassMapper.getClosureRepresentationInfo(element1); | 164 compiler1.closureDataLookup.getClosureRepresentationInfo(element1); |
| 165 ClosureRepresentationInfo closureData2 = | 165 ClosureRepresentationInfo closureData2 = |
| 166 compiler2.closureToClassMapper.getClosureRepresentationInfo(element2); | 166 compiler2.closureDataLookup.getClosureRepresentationInfo(element2); |
| 167 | 167 |
| 168 checkElementIdentities( | 168 checkElementIdentities( |
| 169 closureData1, | 169 closureData1, |
| 170 closureData2, | 170 closureData2, |
| 171 '$element1.closureEntity', | 171 '$element1.closureEntity', |
| 172 closureData1.closureEntity, | 172 closureData1.closureEntity, |
| 173 closureData2.closureEntity); | 173 closureData2.closureEntity); |
| 174 checkElementIdentities( | 174 checkElementIdentities( |
| 175 closureData1, | 175 closureData1, |
| 176 closureData2, | 176 closureData2, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 check(outputUnit1, outputUnit2, 'OutputUnit.isMainOutput $message', | 286 check(outputUnit1, outputUnit2, 'OutputUnit.isMainOutput $message', |
| 287 outputUnit1.isMainOutput, outputUnit2.isMainOutput); | 287 outputUnit1.isMainOutput, outputUnit2.isMainOutput); |
| 288 checkSetEquivalence( | 288 checkSetEquivalence( |
| 289 outputUnit1, | 289 outputUnit1, |
| 290 outputUnit2, | 290 outputUnit2, |
| 291 'OutputUnit.imports $message', | 291 'OutputUnit.imports $message', |
| 292 outputUnit1.imports, | 292 outputUnit1.imports, |
| 293 outputUnit2.imports, | 293 outputUnit2.imports, |
| 294 (a, b) => areElementsEquivalent(a.declaration, b.declaration)); | 294 (a, b) => areElementsEquivalent(a.declaration, b.declaration)); |
| 295 } | 295 } |
| OLD | NEW |