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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/disassembler_x64.cc

Issue 125263002: Fix disassembler crash when mistaking integer values for objects. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« runtime/vm/disassembler_ia32.cc ('K') | « runtime/vm/disassembler_ia32.cc ('k') | runtime/vm/heap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/disassembler_x64.cc
===================================================================
--- runtime/vm/disassembler_x64.cc (revision 31562)
+++ runtime/vm/disassembler_x64.cc (working copy)
@@ -807,8 +807,10 @@
AppendToBuffer("%#" Px "", addr);
// Try to print as heap object or stub name
if (((addr & kSmiTagMask) == kHeapObjectTag) &&
+ reinterpret_cast<RawObject*>(addr)->IsOldObject() &&
!Isolate::Current()->heap()->CodeContains(addr) &&
- Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) {
+ Isolate::Current()->heap()->OldContains(addr - kHeapObjectTag) &&
Ivan Posva 2014/01/07 20:54:59 ditto
srdjan 2014/01/07 21:02:57 Done.
+ Disassembler::CanFindOldObject(addr)) {
const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
if (obj.IsArray()) {
const Array& arr = Array::Cast(obj);
« runtime/vm/disassembler_ia32.cc ('K') | « runtime/vm/disassembler_ia32.cc ('k') | runtime/vm/heap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698