Remove redundant variable descriptors from optimized code.

runtime/vm/debugger.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 442 matching lines @@
     } else {
       column_number_ = -1;
     }
   }
   return column_number_;
 }
 
 
 void ActivationFrame::GetVarDescriptors() {
   if (var_descriptors_.IsNull()) {
-    var_descriptors_ = code().var_descriptors();
+    var_descriptors_ = code().is_optimized()
+        ? Code::Handle(function().unoptimized_code()).var_descriptors()

[srdjan, 2015/04/14 16:53:01]

unoptimized_code may not exist, you may need to trigger compilation here, isn't
it?

[Florian Schneider, 2015/04/15 10:07:07]

Done.

+        : code().var_descriptors();
     ASSERT(!var_descriptors_.IsNull());
   }
 }
 
 
 bool ActivationFrame::IsDebuggable() const {
   return Debugger::IsDebuggable(function());
 }
 
 
@@ skipping 173 matching lines @@
   }
   vars_initialized_ = true;
 }
 
 
 intptr_t ActivationFrame::NumLocalVariables() {
   GetDescIndices();
   return desc_indices_.length();
 }
 
 // TODO(hausner): Handle captured variables.

[Florian Schneider, 2015/04/15 10:07:07]

This TODO seems obsolete: captured variables are already handled in VariableAt.

[hausner, 2015/04/15 16:11:29]

Correct, this comment is no longer true. We handle context variables in
ActivationFrame::VariableAt(). 

 RawObject* ActivationFrame::GetLocalVar(intptr_t slot_index) {
   if (deopt_frame_.IsNull()) {
     uword var_address = fp() + slot_index * kWordSize;
     return reinterpret_cast<RawObject*>(
         *reinterpret_cast<uword*>(var_address));
   } else {
     return deopt_frame_.At(deopt_frame_offset_ + slot_index);
   }
 }
 
@@ skipping 1968 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart