One more premature load-static node generation solved.

runtime/vm/parser.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/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 7507 matching lines @@
     // The field is not yet initialized and could not be initialized at compile
     // time. The getter will initialize the field.
     return initializing_getter;
   }
   // The field is initialized.
   if (field.is_const()) {
     ASSERT(field.value() != Object::sentinel().raw());
     ASSERT(field.value() != Object::transition_sentinel().raw());
     return new LiteralNode(ident_pos, Instance::ZoneHandle(field.value()));
   }
-  // Access the field directly.
-  return new LoadStaticFieldNode(ident_pos, Field::ZoneHandle(field.raw()));
+  ASSERT(field.is_static());
+  const Class& field_owner = Class::ZoneHandle(field.owner());
+  const String& field_name = String::ZoneHandle(field.name());
+  const String& getter_name = String::Handle(Field::GetterName(field_name));
+  const Function& getter =
+      Function::Handle(field_owner.LookupStaticFunction(getter_name));
+  // Never load field directly if there is a getter (deterministic AST).
+  if (getter.IsNull()) {
+    return new LoadStaticFieldNode(ident_pos, Field::ZoneHandle(field.raw()));
+  } else {
+    ASSERT(getter.kind() == RawFunction::kConstImplicitGetter);
+    return new StaticGetterNode(ident_pos,
+                                NULL,  // Receiver.
+                                false,  // is_super_getter.
+                                field_owner,
+                                field_name);
+  }
 }
 
 
 AstNode* Parser::ParseStaticFieldAccess(const Class& cls,
                                         const String& field_name,
                                         intptr_t ident_pos,
                                         bool consume_cascades) {
   TRACE_PARSER("ParseStaticFieldAccess");
   AstNode* access = NULL;
   const intptr_t call_pos = TokenPos();
@@ skipping 625 matching lines @@
       ErrorMsg("circular dependency while initializing static field '%s'",
                field_name.ToCString());
     } else {
       // The implicit static getter will throw the exception if necessary.
       return new StaticGetterNode(TokenPos(),
                                   NULL,
                                   false,
                                   field_owner,
                                   field_name);
     }
-  } else if (value.raw() == Object::sentinel().raw()) {
+  }

[hausner, 2013/06/12 20:43:39]

Why get rid of the else? I prefer it since it is easy to see that we can never
get to the second if when the first if was taken. 

[srdjan, 2013/06/12 21:32:08]

Restored.

+  if (value.raw() == Object::sentinel().raw()) {
     // This field has not been referenced yet and thus the value has
     // not been evaluated. If the field is const, call the static getter method
     // to evaluate the expression and canonicalize the value.
     if (field.is_const()) {
       field.set_value(Object::transition_sentinel());
       const int kNumArguments = 0;  // no arguments.
       const Function& func =
           Function::Handle(Resolver::ResolveStatic(field_owner,
                                                    getter_name,
                                                    kNumArguments,
@@ skipping 1893 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart