runtime/vm/object.cc - Issue 154733002: Fix disassembler crash with profiler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/object.cc

Issue 154733002: Fix disassembler crash with profiler (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 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:

Index: runtime/vm/object.cc

diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc

index a9e3d2625512b63288ec584677569d6f95fc6070..a2da1b60fdf348a524bb3c86793af73836b7d121 100644

--- a/runtime/vm/object.cc

+++ b/runtime/vm/object.cc

@@ -10203,8 +10203,11 @@ void Code::PrintToJSONStream(JSONStream* stream, bool ref) const {

jsobj.AddProperty("is_alive", is_alive());

jsobj.AddProperty("function", Object::Handle(function()));

JSONArray jsarr(&jsobj, "disassembly");

- DisassembleToJSONStream formatter(jsarr);

- Disassemble(&formatter);

+ if (is_alive()) {

+ // Only disassemble alive code objects.

+ DisassembleToJSONStream formatter(jsarr);

+ Disassemble(&formatter);

+ }

}

« no previous file with comments | « runtime/vm/disassembler_x64.cc ('k') | no next file » | no next file with comments »