Make ClassFinalizer indifferent on whether we are generating a snapshot or not.

runtime/vm/parser.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_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
@@ skipping 10 matching lines @@
 
 struct TopLevel;
 struct ClassDesc;
 struct MemberDesc;
 struct ParamList;
 struct QualIdent;
 struct CatchParamDesc;
 struct FieldInitExpression;
 
 // The class ParsedFunction holds the result of parsing a function.
-class ParsedFunction : ValueObject {
+class ParsedFunction : public ValueObject {
  public:
   static const int kFirstLocalSlotIndex = -2;
 
   explicit ParsedFunction(const Function& function)
       : function_(function),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::Handle()),
         saved_context_var_(NULL),
         expression_temp_var_(NULL),
@@ skipping 56 matching lines @@
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int copied_parameter_count_;
   int stack_local_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
-class Parser : ValueObject {
+class Parser : public ValueObject {
  public:
   Parser(const Script& script, const Library& library);
   Parser(const Script& script, const Function& function, intptr_t token_pos);
 
   // Parse the top level of a whole script file and register declared classes
   // and interfaces in the given library.
   static void ParseCompilationUnit(const Library& library,
                                    const Script& script);
 
   static void ParseFunction(ParsedFunction* parsed_function);
@@ skipping 187 matching lines @@
   void ParseClassMemberDefinition(ClassDesc* members);
   void ParseFormalParameter(bool allow_explicit_default_value,
                             ParamList* params);
   void ParseFormalParameters(bool allow_explicit_default_values,
                              ParamList* params);
   void ParseFormalParameterList(bool allow_explicit_default_values,
                                 ParamList* params);
   void CheckConstFieldsInitialized(const Class& cls);
   void AddImplicitConstructor(ClassDesc* members);
   void CheckConstructorCycles(ClassDesc* members);
-  void ParseInitializedInstanceFields(const Class& cls,
-           LocalVariable* receiver,
-           GrowableArray<Field*>* initialized_fields);
+  void ParseInitializedInstanceFields(
+      const Class& cls,
+      LocalVariable* receiver,
+      GrowableArray<Field*>* initialized_fields);
   void CheckDuplicateFieldInit(intptr_t init_pos,
                                GrowableArray<Field*>* initialized_fields,
                                Field* field);
   void GenerateSuperConstructorCall(const Class& cls,
                                     LocalVariable* receiver);
   AstNode* ParseSuperInitializer(const Class& cls, LocalVariable* receiver);
   AstNode* ParseInitializer(const Class& cls,
                             LocalVariable* receiver,
                             GrowableArray<Field*>* initialized_fields);
   void ParseConstructorRedirection(const Class& cls, LocalVariable* receiver);
   void ParseInitializers(const Class& cls,
                          LocalVariable* receiver,
                          GrowableArray<Field*>* initialized_fields);
   String& ParseNativeDeclaration();
   // TODO(srdjan): Return TypeArguments instead of Array?
   RawArray* ParseInterfaceList();
+  void AddInterfaceIfUnique(intptr_t interfaces_pos,
+                            const GrowableObjectArray& interface_list,
+                            const AbstractType& interface);
   void AddInterfaces(intptr_t interfaces_pos,
                      const Class& cls,
                      const Array& interfaces);
   ArgumentListNode* BuildNoSuchMethodArguments(
       const String& function_name, const ArgumentListNode& function_args);
   RawFunction* GetSuperFunction(intptr_t token_pos,
                                 const String& name,
                                 bool* is_no_such_method);
   AstNode* ParseSuperCall(const String& function_name);
   AstNode* ParseSuperFieldAccess(const String& field_name);
@@ skipping 245 matching lines @@
 
   // Allocate temporary only once per function.
   LocalVariable* expression_temp_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_