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

Side by Side Diff: runtime/vm/isolate_reload.cc

Issue 1965493004: Canonicalize generic types in an isolate specific hash table (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: address-merge-conflicts Created 4 years, 7 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
« no previous file with comments | « runtime/vm/intrinsifier_x64.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/code_generator.h" 8 #include "vm/code_generator.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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 // New class maps to itself. 292 // New class maps to itself.
293 AddClassMapping(new_cls, new_cls); 293 AddClassMapping(new_cls, new_cls);
294 return; 294 return;
295 } 295 }
296 new_cls.set_id(old_cls.id()); 296 new_cls.set_id(old_cls.id());
297 isolate()->class_table()->SetAt(old_cls.id(), new_cls.raw()); 297 isolate()->class_table()->SetAt(old_cls.id(), new_cls.raw());
298 if (!old_cls.is_enum_class()) { 298 if (!old_cls.is_enum_class()) {
299 new_cls.CopyCanonicalConstants(old_cls); 299 new_cls.CopyCanonicalConstants(old_cls);
300 } 300 }
301 new_cls.CopyCanonicalTypes(old_cls); 301 new_cls.CopyCanonicalType(old_cls);
302 AddBecomeMapping(old_cls, new_cls); 302 AddBecomeMapping(old_cls, new_cls);
303 AddClassMapping(new_cls, old_cls); 303 AddClassMapping(new_cls, old_cls);
304 } 304 }
305 305
306 306
307 void IsolateReloadContext::FinishReload() { 307 void IsolateReloadContext::FinishReload() {
308 BuildLibraryMapping(); 308 BuildLibraryMapping();
309 TIR_Print("---- DONE FINALIZING\n"); 309 TIR_Print("---- DONE FINALIZING\n");
310 if (ValidateReload()) { 310 if (ValidateReload()) {
311 Commit(); 311 Commit();
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 ASSERT(!super_cls.IsNull()); 1216 ASSERT(!super_cls.IsNull());
1217 super_cls.AddDirectSubclass(cls); 1217 super_cls.AddDirectSubclass(cls);
1218 } 1218 }
1219 } 1219 }
1220 } 1220 }
1221 } 1221 }
1222 1222
1223 #endif // !PRODUCT 1223 #endif // !PRODUCT
1224 1224
1225 } // namespace dart 1225 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/intrinsifier_x64.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698