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

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

Issue 1191333005: Fix build break. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | no next file » | 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/bootstrap.h" 8 #include "vm/bootstrap.h"
9 #include "vm/class_finalizer.h" 9 #include "vm/class_finalizer.h"
10 #include "vm/dart.h" 10 #include "vm/dart.h"
(...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 } else { 1383 } else {
1384 switch (id) { 1384 switch (id) {
1385 VM_OBJECT_CLASS_LIST(VM_OBJECT_WRITE) 1385 VM_OBJECT_CLASS_LIST(VM_OBJECT_WRITE)
1386 case kTypedDataUint32ArrayCid: { 1386 case kTypedDataUint32ArrayCid: {
1387 object_id = forward_list_->AddObject(rawobj, kIsSerialized); 1387 object_id = forward_list_->AddObject(rawobj, kIsSerialized);
1388 RawTypedData* raw_obj = reinterpret_cast<RawTypedData*>(rawobj); 1388 RawTypedData* raw_obj = reinterpret_cast<RawTypedData*>(rawobj);
1389 raw_obj->WriteTo(this, object_id, kind()); 1389 raw_obj->WriteTo(this, object_id, kind());
1390 return; 1390 return;
1391 } 1391 }
1392 default: 1392 default:
1393 OS::Print("class id = %d\n", id); 1393 OS::Print("class id = %" Pd "\n", id);
1394 break; 1394 break;
1395 } 1395 }
1396 } 1396 }
1397 } 1397 }
1398 UNREACHABLE(); 1398 UNREACHABLE();
1399 } 1399 }
1400 1400
1401 #undef VM_OBJECT_WRITE 1401 #undef VM_OBJECT_WRITE
1402 1402
1403 1403
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 nodes_.Add(node); 1732 nodes_.Add(node);
1733 return object_id; 1733 return object_id;
1734 } 1734 }
1735 1735
1736 1736
1737 intptr_t ForwardList::AddObject(RawObject* raw, SerializeState state) { 1737 intptr_t ForwardList::AddObject(RawObject* raw, SerializeState state) {
1738 NoSafepointScope no_safepoint; 1738 NoSafepointScope no_safepoint;
1739 intptr_t object_id = next_object_id(); 1739 intptr_t object_id = next_object_id();
1740 ASSERT(object_id > 0 && object_id <= kMaxObjectId); 1740 ASSERT(object_id > 0 && object_id <= kMaxObjectId);
1741 uword tags = raw->ptr()->tags_; 1741 uword tags = raw->ptr()->tags_;
1742 // OS::Print("tags = 0x%x\n", tags);
1743 ASSERT(SerializedHeaderTag::decode(tags) != kObjectId); 1742 ASSERT(SerializedHeaderTag::decode(tags) != kObjectId);
1744 Node* node = new Node(raw, tags, state); 1743 Node* node = new Node(raw, tags, state);
1745 ASSERT(node != NULL); 1744 ASSERT(node != NULL);
1746 nodes_.Add(node); 1745 nodes_.Add(node);
1747 return object_id; 1746 return object_id;
1748 } 1747 }
1749 1748
1750 1749
1751 intptr_t ForwardList::FindObject(RawObject* raw) { 1750 intptr_t ForwardList::FindObject(RawObject* raw) {
1752 NoSafepointScope no_safepoint; 1751 NoSafepointScope no_safepoint;
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 NoSafepointScope no_safepoint; 2341 NoSafepointScope no_safepoint;
2343 WriteObject(obj.raw()); 2342 WriteObject(obj.raw());
2344 UnmarkAll(); 2343 UnmarkAll();
2345 } else { 2344 } else {
2346 ThrowException(exception_type(), exception_msg()); 2345 ThrowException(exception_type(), exception_msg());
2347 } 2346 }
2348 } 2347 }
2349 2348
2350 2349
2351 } // namespace dart 2350 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698