Fix generation of context level descriptors (issue 22391).

runtime/vm/scopes.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/scopes.h"
 
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 278 matching lines @@
   ASSERT(str.Length() > 0);
   return str.CharAt(0) == ':';
 }
 
 
 // Add visible variables that are declared in this scope to vars, then
 // collect visible variables of children, followed by siblings.
 void LocalScope::CollectLocalVariables(GrowableArray<VarDesc>* vars,
                                        int16_t* scope_id) {
   (*scope_id)++;
-  if (HasContextLevel() &&
-      ((parent() == NULL) ||
-      (!parent()->HasContextLevel()) ||
-      (parent()->context_level() != context_level()))) {
-    // This is the outermost scope with a context level or this scope's
-    // context level differs from its parent's level.
+  if (num_context_variables() > 0) {
     VarDesc desc;
     desc.name = &Symbols::Empty();  // No name.
     desc.info.set_kind(RawLocalVarDescriptors::kContextLevel);
     desc.info.scope_id = *scope_id;
     desc.info.begin_pos = begin_token_pos();
     desc.info.end_pos = end_token_pos();
     desc.info.set_index(context_level());
     vars->Add(desc);
   }
   for (int i = 0; i < this->variables_.length(); i++) {
@@ skipping 352 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart