OLD | NEW |
1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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 #include "vm/isolate_reload.h" | 5 #include "vm/isolate_reload.h" |
6 | 6 |
7 #include "vm/become.h" | 7 #include "vm/become.h" |
8 #include "vm/bit_vector.h" | 8 #include "vm/bit_vector.h" |
9 #include "vm/compiler.h" | 9 #include "vm/compiler.h" |
10 #include "vm/dart_api_impl.h" | 10 #include "vm/dart_api_impl.h" |
(...skipping 1308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1319 iteration.IterateObjects(&check_canonical); | 1319 iteration.IterateObjects(&check_canonical); |
1320 #endif // DEBUG | 1320 #endif // DEBUG |
1321 } | 1321 } |
1322 | 1322 |
1323 void IsolateReloadContext::RehashConstants() { | 1323 void IsolateReloadContext::RehashConstants() { |
1324 TIMELINE_SCOPE(RehashConstants); | 1324 TIMELINE_SCOPE(RehashConstants); |
1325 ClassTable* class_table = I->class_table(); | 1325 ClassTable* class_table = I->class_table(); |
1326 Class& cls = Class::Handle(zone_); | 1326 Class& cls = Class::Handle(zone_); |
1327 const intptr_t top = class_table->NumCids(); | 1327 const intptr_t top = class_table->NumCids(); |
1328 for (intptr_t cid = kInstanceCid; cid < top; cid++) { | 1328 for (intptr_t cid = kInstanceCid; cid < top; cid++) { |
| 1329 if (cid == kTypeArgumentsCid) { |
| 1330 continue; |
| 1331 } |
1329 if (!class_table->IsValidIndex(cid) || !class_table->HasValidClassAt(cid)) { | 1332 if (!class_table->IsValidIndex(cid) || !class_table->HasValidClassAt(cid)) { |
1330 // Skip invalid classes. | 1333 // Skip invalid classes. |
1331 continue; | 1334 continue; |
1332 } | 1335 } |
1333 if (RawObject::IsNumberClassId(cid) || RawObject::IsStringClassId(cid)) { | 1336 if (RawObject::IsNumberClassId(cid) || RawObject::IsStringClassId(cid)) { |
1334 // Skip classes that cannot be affected by the 'become' operation. | 1337 // Skip classes that cannot be affected by the 'become' operation. |
1335 continue; | 1338 continue; |
1336 } | 1339 } |
1337 // Rehash constants. | 1340 // Rehash constants. |
1338 cls = class_table->At(cid); | 1341 cls = class_table->At(cid); |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1882 ASSERT(!super_cls.IsNull()); | 1885 ASSERT(!super_cls.IsNull()); |
1883 super_cls.AddDirectSubclass(cls); | 1886 super_cls.AddDirectSubclass(cls); |
1884 } | 1887 } |
1885 } | 1888 } |
1886 } | 1889 } |
1887 } | 1890 } |
1888 | 1891 |
1889 #endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) | 1892 #endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) |
1890 | 1893 |
1891 } // namespace dart | 1894 } // namespace dart |
OLD | NEW |