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

Unified Diff: runtime/vm/debugger.cc

Issue 1077793003: Remove redundant variable descriptors from optimized code. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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
« no previous file with comments | « runtime/vm/debugger.h ('k') | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger.cc
===================================================================
--- runtime/vm/debugger.cc (revision 45130)
+++ runtime/vm/debugger.cc (working copy)
@@ -460,7 +460,12 @@
void ActivationFrame::GetVarDescriptors() {
if (var_descriptors_.IsNull()) {
- var_descriptors_ = code().var_descriptors();
+ if (code().is_optimized()) {
+ Compiler::EnsureUnoptimizedCode(Thread::Current(), function());
+ }
+ var_descriptors_ = code().is_optimized()
+ ? Code::Handle(function().unoptimized_code()).var_descriptors()
+ : code().var_descriptors();
srdjan 2015/04/15 16:25:45 Could this be just : var_descriptors = Code::Handl
Florian Schneider 2015/04/16 11:37:18 Yes. I'll simplify it. I think it is fine to have
ASSERT(!var_descriptors_.IsNull());
}
}
@@ -654,7 +659,7 @@
return desc_indices_.length();
}
-// TODO(hausner): Handle captured variables.
+
RawObject* ActivationFrame::GetLocalVar(intptr_t slot_index) {
if (deopt_frame_.IsNull()) {
uword var_address = fp() + slot_index * kWordSize;
« no previous file with comments | « runtime/vm/debugger.h ('k') | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698