Split the computation of uninstantiated type arguments between the factory case

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 25 matching lines @@
 // | LoadStaticField <Field>
 // | StoreStaticField <Field> <Value>
 // | BooleanNegate <Value>
 // | InstanceOf <Value> <Type>
 // | CreateArray <ArrayNode> <Value> ...
 // | CreateClosure <ClosureNode>
 // | AllocateObject <ConstructorCallNode>
 // | Throw <Value>
 // | ReThrow <Value> <Value>
 // | NativeLoadField <Value> <intptr_t>
-// | ExtractTypeArgumentsComp <ConstructorCallNode> <Value>
+// | ExtractFactoryTypeArgumentsComp <ConstructorCallNode> <Value>
+// | ExtractConstructorTypeArgumentsComp <ConstructorCallNode> <Value>
+// | ExtractConstructorInstantiatorComp <ConstructorCallNode> <Value> <Value>
 //
 // <Value> ::=
 //   Temp <int>
 // | Constant <Instance>
 
 // M is a two argument macro.  It is applied to each concrete value's
 // typename and classname.
 #define FOR_EACH_VALUE(M)                                                      \
   M(Temp, TempVal)                                                             \
   M(Constant, ConstantVal)                                                     \
@@ skipping 19 matching lines @@
   M(LoadStaticField, LoadStaticFieldComp)                                      \
   M(StoreStaticField, StoreStaticFieldComp)                                    \
   M(BooleanNegate, BooleanNegateComp)                                          \
   M(InstanceOf, InstanceOfComp)                                                \
   M(CreateArray, CreateArrayComp)                                              \
   M(CreateClosure, CreateClosureComp)                                          \
   M(AllocateObject, AllocateObjectComp)                                        \
   M(Throw, ThrowComp)                                                          \
   M(ReThrow, ReThrowComp)                                                      \
   M(NativeLoadField, NativeLoadFieldComp)                                      \
-  M(ExtractTypeArguments, ExtractTypeArgumentsComp)                            \
+  M(ExtractFactoryTypeArguments, ExtractFactoryTypeArgumentsComp)              \
+  M(ExtractConstructorTypeArguments, ExtractConstructorTypeArgumentsComp)      \
+  M(ExtractConstructorInstantiator, ExtractConstructorInstantiatorComp)        \
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 class Computation : public ZoneAllocated {
  public:
   Computation() { }
 
@@ skipping 601 matching lines @@
 };
 
 
 class NativeLoadFieldComp : public Computation {
  public:
   NativeLoadFieldComp(Value* value, intptr_t offset_in_bytes)
       : value_(value), offset_in_bytes_(offset_in_bytes) {
     ASSERT(value != NULL);
   }
 
   DECLARE_COMPUTATION(NativeLoadFieldComp)

[regis, 2012/03/15 20:13:02]

I fixed this one too.

 
   Value* value() const { return value_; }
   intptr_t offset_in_bytes() const { return offset_in_bytes_; }
 
  private:
   Value* value_;
   intptr_t offset_in_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeLoadFieldComp);
 };
 
 
-class ExtractTypeArgumentsComp : public Computation {
+class ExtractFactoryTypeArgumentsComp : public Computation {
  public:
-  ExtractTypeArgumentsComp(ConstructorCallNode* ast_node, Value* instantiator)
+  ExtractFactoryTypeArgumentsComp(ConstructorCallNode* ast_node,
+                                  Value* instantiator)
       : ast_node_(*ast_node), instantiator_(instantiator) {
     ASSERT(instantiator_ != NULL);
   }
 
-  DECLARE_COMPUTATION(ExtractTypeArgumentsComp)
+  DECLARE_COMPUTATION(ExtractFactoryTypeArgumentsComp)

[srdjan, 2012/03/15 19:58:05]

DEFCLARE_COMPUTATION(ExtractFactoryTypeArguments)  ... no Comp... can you fix
the NativeLoadField above as well?

[regis, 2012/03/15 20:13:02]

Done.

+
+  Value* instantiator() const { return instantiator_; }
+  const AbstractTypeArguments& type_arguments() const {
+    return ast_node_.type_arguments();
+  }
+  const Function& factory() const { return ast_node_.constructor(); }
+  intptr_t node_id() const { return ast_node_.id(); }
+  intptr_t token_index() const { return ast_node_.token_index(); }
+
+ private:
+  const ConstructorCallNode& ast_node_;
+  Value* instantiator_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtractFactoryTypeArgumentsComp);
+};
+
+
+class ExtractConstructorTypeArgumentsComp : public Computation {
+ public:
+  ExtractConstructorTypeArgumentsComp(ConstructorCallNode* ast_node,
+                                      Value* instantiator)
+      : ast_node_(*ast_node), instantiator_(instantiator) {
+    ASSERT(instantiator_ != NULL);
+  }
+
+  DECLARE_COMPUTATION(ExtractConstructorTypeArgumentsComp)

[regis, 2012/03/15 20:13:02]

Fixed this one too.

 
   Value* instantiator() const { return instantiator_; }
   const AbstractTypeArguments& type_arguments() const {
     return ast_node_.type_arguments();
   }
   const Function& constructor() const { return ast_node_.constructor(); }
   intptr_t node_id() const { return ast_node_.id(); }
   intptr_t token_index() const { return ast_node_.token_index(); }
 
  private:
   const ConstructorCallNode& ast_node_;
   Value* instantiator_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtractTypeArgumentsComp);
+  DISALLOW_COPY_AND_ASSIGN(ExtractConstructorTypeArgumentsComp);
+};
+
+
+class ExtractConstructorInstantiatorComp : public Computation {
+ public:
+  ExtractConstructorInstantiatorComp(ConstructorCallNode* ast_node,
+                                     Value* instantiator,
+                                     Value* discard_value)
+      : ast_node_(*ast_node),
+        instantiator_(instantiator),
+        discard_value_(discard_value) {
+    ASSERT(instantiator_ != NULL);
+  }
+
+  DECLARE_COMPUTATION(ExtractConstructorInstantiatorComp)

[srdjan, 2012/03/15 19:58:05]

ditto

[regis, 2012/03/15 20:13:02]

Done.

+
+  Value* instantiator() const { return instantiator_; }
+  Value* discard_value() const { return discard_value_; }
+  const AbstractTypeArguments& type_arguments() const {
+    return ast_node_.type_arguments();
+  }
+  const Function& constructor() const { return ast_node_.constructor(); }
+  intptr_t node_id() const { return ast_node_.id(); }
+  intptr_t token_index() const { return ast_node_.token_index(); }
+
+ private:
+  const ConstructorCallNode& ast_node_;
+  Value* instantiator_;
+  Value* discard_value_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtractConstructorInstantiatorComp);
 };
 
 
 #undef DECLARE_COMPUTATION
 
 
 // Instructions.
 //
 // <Instruction> ::= JoinEntry <Instruction>
 //                 | TargetEntry <Instruction>
@@ skipping 332 matching lines @@
 #undef DECLARE_VISIT_INSTRUCTION
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_