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

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

Issue 12079117: Revert changes 17962-3 which break Dartium Debug build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « runtime/vm/raw_object_snapshot.cc ('k') | runtime/vm/snapshot_test.cc » ('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) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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/snapshot.h" 5 #include "vm/snapshot.h"
6 6
7 #include "platform/assert.h" 7 #include "platform/assert.h"
8 #include "vm/bigint_operations.h" 8 #include "vm/bigint_operations.h"
9 #include "vm/bootstrap.h" 9 #include "vm/bootstrap.h"
10 #include "vm/class_finalizer.h"
11 #include "vm/exceptions.h" 10 #include "vm/exceptions.h"
12 #include "vm/heap.h" 11 #include "vm/heap.h"
13 #include "vm/longjump.h" 12 #include "vm/longjump.h"
14 #include "vm/object.h" 13 #include "vm/object.h"
15 #include "vm/object_store.h" 14 #include "vm/object_store.h"
16 #include "vm/snapshot_ids.h" 15 #include "vm/snapshot_ids.h"
17 #include "vm/symbols.h" 16 #include "vm/symbols.h"
18 17
19 namespace dart { 18 namespace dart {
20 19
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 } 940 }
942 UNREACHABLE(); 941 UNREACHABLE();
943 } 942 }
944 943
945 944
946 void FullSnapshotWriter::WriteFullSnapshot() { 945 void FullSnapshotWriter::WriteFullSnapshot() {
947 Isolate* isolate = Isolate::Current(); 946 Isolate* isolate = Isolate::Current();
948 ASSERT(isolate != NULL); 947 ASSERT(isolate != NULL);
949 ObjectStore* object_store = isolate->object_store(); 948 ObjectStore* object_store = isolate->object_store();
950 ASSERT(object_store != NULL); 949 ASSERT(object_store != NULL);
951 ASSERT(ClassFinalizer::AllClassesFinalized());
952 950
953 // Setup for long jump in case there is an exception while writing 951 // Setup for long jump in case there is an exception while writing
954 // the snapshot. 952 // the snapshot.
955 LongJump* base = isolate->long_jump_base(); 953 LongJump* base = isolate->long_jump_base();
956 LongJump jump; 954 LongJump jump;
957 isolate->set_long_jump_base(&jump); 955 isolate->set_long_jump_base(&jump);
958 // TODO(6726): Allocate these constant strings once in the VM isolate. 956 // TODO(6726): Allocate these constant strings once in the VM isolate.
959 *ErrorHandle() = LanguageError::New( 957 *ErrorHandle() = LanguageError::New(
960 String::Handle(String::New("Error while writing full snapshot"))); 958 String::Handle(String::New("Error while writing full snapshot")));
961 if (setjmp(*jump.Set()) == 0) { 959 if (setjmp(*jump.Set()) == 0) {
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 UnmarkAll(); 1312 UnmarkAll();
1315 isolate->set_long_jump_base(base); 1313 isolate->set_long_jump_base(base);
1316 } else { 1314 } else {
1317 isolate->set_long_jump_base(base); 1315 isolate->set_long_jump_base(base);
1318 ThrowException(exception_type(), exception_msg()); 1316 ThrowException(exception_type(), exception_msg());
1319 } 1317 }
1320 } 1318 }
1321 1319
1322 1320
1323 } // namespace dart 1321 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/raw_object_snapshot.cc ('k') | runtime/vm/snapshot_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698