Implement deferred constant support

runtime/vm/ast.h

 // 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.
 
 #ifndef VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 422 matching lines @@
 
 class ClosureNode : public AstNode {
  public:
   ClosureNode(intptr_t token_pos,
               const Function& function,
               AstNode* receiver,  // Non-null for implicit instance closures.
               LocalScope* scope)  // Null for implicit closures.
       : AstNode(token_pos),
         function_(function),
         receiver_(receiver),
-        scope_(scope) {
+        scope_(scope),
+        is_deferred_reference_(false) {
     ASSERT(function_.IsZoneHandle());
     ASSERT((function_.IsNonImplicitClosureFunction() &&
             (receiver_ == NULL) && (scope_ != NULL)) ||
            (function_.IsImplicitInstanceClosureFunction() &&
             (receiver_ != NULL) && (scope_ == NULL)) ||
            (function_.IsImplicitStaticClosureFunction() &&
             (receiver_ == NULL) && (scope_ == NULL)));
   }
 
   const Function& function() const { return function_; }
   AstNode* receiver() const { return receiver_; }
   LocalScope* scope() const { return scope_; }
 
+  void set_is_deferred(bool value) { is_deferred_reference_ = value; }
+
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     if (receiver() != NULL) {
       receiver()->Visit(visitor);
     }
   }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(ClosureNode);
 
  private:
   const Function& function_;
   AstNode* receiver_;
   LocalScope* scope_;
+  bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ClosureNode);
 };
 
 
 // Primary nodes hold identifiers or values (library, class or function)
 // resolved from an identifier. Primary nodes should not ever make it to the
 // code generation phase as they will be transformed into the correct call or
 // field access nodes.
 class PrimaryNode : public AstNode {
  public:
   PrimaryNode(intptr_t token_pos, const Object& primary)
-      : AstNode(token_pos), primary_(primary) {
+      : AstNode(token_pos),
+        primary_(primary),
+        is_deferred_reference_(false) {
     ASSERT(primary_.IsNotTemporaryScopedHandle());
   }
 
   const Object& primary() const { return primary_; }
 
+  void set_is_deferred(bool value) { is_deferred_reference_ = value; }
+  bool is_deferred_reference() const { return is_deferred_reference_; }
+
   bool IsSuper() const {
     return primary().IsString() && (primary().raw() == Symbols::Super().raw());
   }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(PrimaryNode);
 
  private:
   const Object& primary_;
+  bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PrimaryNode);
 };
 
 
 class ReturnNode : public AstNode {
  public:
   // Return from a void function returns the null object.
   explicit ReturnNode(intptr_t token_pos)
       : AstNode(token_pos),
@@ skipping 151 matching lines @@
   DECLARE_COMMON_NODE_FUNCTIONS(BinaryOpWithMask32Node);
 
  private:
   // Optional unsigned 32 bit mask applied on result. No mask: -1.
   const int64_t mask32_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(BinaryOpWithMask32Node);
 };
 
 
-
 class UnaryOpNode : public AstNode {
  public:
   // Returns optimized version, e.g., for ('-' '1') ('-1') literal is returned.
   static AstNode* UnaryOpOrLiteral(intptr_t token_pos,
                                    Token::Kind kind,
                                    AstNode* operand);
   UnaryOpNode(intptr_t token_pos,
               Token::Kind kind,
               AstNode* operand)
       : AstNode(token_pos), kind_(kind), operand_(operand) {
@@ skipping 449 matching lines @@
   const Field& field_;
   AstNode* value_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StoreInstanceFieldNode);
 };
 
 
 class LoadStaticFieldNode : public AstNode {
  public:
   LoadStaticFieldNode(intptr_t token_pos, const Field& field)
-      : AstNode(token_pos), field_(field) {
+      : AstNode(token_pos), field_(field), is_deferred_reference_(false) {
     ASSERT(field_.IsZoneHandle());
   }
 
   const Field& field() const { return field_; }
+  void set_is_deferred(bool value) { is_deferred_reference_ = value; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   virtual bool IsPotentiallyConst() const {
     return field_.is_const();
   }
 
   virtual const Instance* EvalConstExpr() const {
     ASSERT(field_.is_static());
-    return field_.is_const() ? &Instance::ZoneHandle(field_.value()) : NULL;
+if (is_deferred_reference_) printf("DDDDD\n");

[srdjan, 2014/04/07 17:19:10]

Why only four Ds?

[hausner, 2014/04/07 17:30:27]

Eins zwei drei vier fünf...

DDDDDone.

+    return !is_deferred_reference_ && field_.is_const()
+        ? &Instance::ZoneHandle(field_.value())
+        : NULL;
   }
 
   DECLARE_COMMON_NODE_FUNCTIONS(LoadStaticFieldNode);
 
  private:
   const Field& field_;
+  bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LoadStaticFieldNode);
 };
 
 
 class StoreStaticFieldNode : public AstNode {
  public:
   StoreStaticFieldNode(intptr_t token_pos, const Field& field, AstNode* value)
       : AstNode(token_pos), field_(field), value_(value) {
     ASSERT(field_.IsZoneHandle());
@@ skipping 203 matching lines @@
  public:
   StaticGetterNode(intptr_t token_pos,
                    AstNode* receiver,
                    bool is_super_getter,
                    const Class& cls,
                    const String& field_name)
       : AstNode(token_pos),
         receiver_(receiver),
         cls_(cls),
         field_name_(field_name),
-        is_super_getter_(is_super_getter) {
+        is_super_getter_(is_super_getter),
+        is_deferred_reference_(false) {
     ASSERT(cls_.IsZoneHandle());
     ASSERT(field_name_.IsZoneHandle());
     ASSERT(field_name_.IsSymbol());
   }
 
   // The receiver is required
   // 1) for a super getter (an instance method that is resolved at compile
   //    time rather than at runtime).
   // 2) when transforming this StaticGetterNode issued in a non-static
   //    context to an InstanceSetterNode. This may occurs when we find a
   //    static getter, but no field and no static setter are declared.
   AstNode* receiver() const { return receiver_; }
   const Class& cls() const { return cls_; }
   const String& field_name() const { return field_name_; }
   bool is_super_getter() const { return is_super_getter_; }
+  void set_is_deferred(bool value) { is_deferred_reference_ = value; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(StaticGetterNode);
 
  private:
   AstNode* receiver_;
   const Class& cls_;
   const String& field_name_;
   const bool is_super_getter_;
+  bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticGetterNode);
 };
 
 
 class StaticSetterNode : public AstNode {
  public:
   StaticSetterNode(intptr_t token_pos,
                    AstNode* receiver,
                    const Class& cls,
@@ skipping 357 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_