Debugger no longer causes top level variable initialization

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 1788 matching lines @@
 }
 
 
 void Debugger::CollectLibraryFields(const GrowableObjectArray& field_list,
                                     const Library& lib,
                                     const String& prefix,
                                     bool include_private_fields) {
   DictionaryIterator it(lib);
   Object& entry = Object::Handle(isolate_);
   Field& field = Field::Handle(isolate_);
-  Class& cls = Class::Handle(isolate_);
   String& field_name = String::Handle(isolate_);
   Object& field_value = Object::Handle(isolate_);
   while (it.HasNext()) {
     entry = it.GetNext();
     if (entry.IsField()) {
       field ^= entry.raw();
-      cls = field.owner();
       ASSERT(field.is_static());
       field_name = field.name();
       if ((field_name.CharAt(0) == '_') && !include_private_fields) {
         // Skip library-private field.
         continue;
       }
-      field_value = GetStaticField(cls, field_name);
+      // If the field is not initialized yet, just report the value
+      // to be null. We don't want to execute the implicit getter

[Jakob.Gruber, 2014/01/09 21:46:38]

The comment now refers to null while the value is actually set to Uninitialized.

[hausner, 2014/01/09 21:50:05]

Nice catch, thank you.

+      // since it may have side effects.
+      if ((field.value() == Object::sentinel().raw()) ||
+          (field.value() == Object::transition_sentinel().raw())) {
+        field_value = Symbols::Uninitialized().raw();
+      } else {
+        field_value = field.value();
+      }
       if (!prefix.IsNull()) {
         field_name = String::Concat(prefix, field_name);
       }
       field_list.Add(field_name);
       field_list.Add(field_value);
     }
   }
 }
 
 
@@ skipping 447 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart