languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 01:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VM/Service] Move handling of closures in service to Closure::PrintJSONImpl()

Browse source 
TEST=CI

Change-Id: Iebb568837f5ed00c97eaadf0490a62cfbfb554bc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/267040
Commit-Queue: Derek Xu <derekx@google.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
This commit is contained in:
Derek Xu 2022-11-03 18:08:12 +00:00 committed by Commit Queue
parent d6415b2fe0
commit 024a4603d1
1 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
runtime/vm/object_service.cc
View file

@ -1161,32 +1161,8 @@ void Instance::PrintSharedInstanceJSON(JSONObject* jsobj,
void Instance::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
PrintSharedInstanceJSON(&jsobj, ref);
// TODO(regis): Wouldn't it be simpler to provide a Closure::PrintJSONImpl()?
if (IsClosure()) {
jsobj.AddProperty("kind", "Closure");
} else {
jsobj.AddProperty("kind", "PlainInstance");
}
if (IsClosure()) {
// TODO(regis): How about closureInstantiatorTypeArguments and
// closureFunctionTypeArguments?
jsobj.AddProperty("closureFunction",
Function::Handle(Closure::Cast(*this).function()));
jsobj.AddProperty("closureContext",
Context::Handle(Closure::Cast(*this).context()));
}
if (ref) {
return;
}
if (IsClosure()) {
Debugger* debugger = Isolate::Current()->debugger();
Breakpoint* bpt = debugger->BreakpointAtActivation(*this);
if (bpt != NULL) {
jsobj.AddProperty("_activationBreakpoint", bpt);
}
}
jsobj.AddProperty("kind", "PlainInstance");
}
void AbstractType::PrintJSONImpl(JSONStream* stream, bool ref) const {
@ -1647,7 +1623,22 @@ void ClosureData::PrintJSONImpl(JSONStream* stream, bool ref) const {
}
void Closure::PrintJSONImpl(JSONStream* stream, bool ref) const {
Instance::PrintJSONImpl(stream, ref);
JSONObject jsobj(stream);
PrintSharedInstanceJSON(&jsobj, ref);
jsobj.AddProperty("kind", "Closure");
jsobj.AddProperty("closureFunction",
Function::Handle(Closure::Cast(*this).function()));
jsobj.AddProperty("closureContext",
Context::Handle(Closure::Cast(*this).context()));
if (ref) {
return;
}
Debugger* debugger = Isolate::Current()->debugger();
Breakpoint* bpt = debugger->BreakpointAtActivation(*this);
if (bpt != nullptr) {
jsobj.AddProperty("_activationBreakpoint", bpt);
}
}
void Record::PrintJSONImpl(JSONStream* stream, bool ref) const {