Refactor the IL for object allocation with type arguments.

runtime/vm/intermediate_language_arm.cc

 // Copyright (c) 2013, 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/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 1599 matching lines @@
 
   // instantiator_reg is the instantiator type argument vector, i.e. an
   // AbstractTypeArguments object (or null).
   ASSERT(!type_arguments().IsUninstantiatedIdentity() &&
          !type_arguments().CanShareInstantiatorTypeArguments(
              instantiator_class()));
   // If the instantiator is null and if the type argument vector
   // instantiated from null becomes a vector of dynamic, then use null as
   // the type arguments.
   Label type_arguments_instantiated;
-  const intptr_t len = type_arguments().Length();
-  if (type_arguments().IsRawInstantiatedRaw(len)) {
-    __ CompareImmediate(instantiator_reg,
-                        reinterpret_cast<intptr_t>(Object::null()));
-    __ b(&type_arguments_instantiated, EQ);
-  }
+  ASSERT(type_arguments().IsRawInstantiatedRaw(type_arguments().Length()));

[regis, 2013/05/21 16:39:36]

Do I understand correctly that you only use this
ExtractConstructorTypeArgumentsInstr any more in the case where the
uninstantiated type arguments is set to null if the instantiator is null? A
comment would be useful.

+  __ CompareImmediate(instantiator_reg,
+                      reinterpret_cast<intptr_t>(Object::null()));
+  __ b(&type_arguments_instantiated, EQ);
   // Instantiate non-null type arguments.
   // In the non-factory case, we rely on the allocation stub to
   // instantiate the type arguments.
   __ LoadObject(result_reg, type_arguments());
   // result_reg: uninstantiated type arguments.
   __ Bind(&type_arguments_instantiated);
 
   // result_reg: uninstantiated or instantiated type arguments.
 }
 
@@ skipping 17 matching lines @@
 
   // instantiator_reg is the instantiator AbstractTypeArguments object
   // (or null).
   ASSERT(!type_arguments().IsUninstantiatedIdentity() &&
          !type_arguments().CanShareInstantiatorTypeArguments(
              instantiator_class()));
 
   // If the instantiator is null and if the type argument vector
   // instantiated from null becomes a vector of dynamic, then use null as
   // the type arguments and do not pass the instantiator.
-  const intptr_t len = type_arguments().Length();
-  if (type_arguments().IsRawInstantiatedRaw(len)) {
-    Label instantiator_not_null;
-    __ CompareImmediate(instantiator_reg,
-                        reinterpret_cast<intptr_t>(Object::null()));
-    __ b(&instantiator_not_null, NE);
-    // Null was used in VisitExtractConstructorTypeArguments as the
-    // instantiated type arguments, no proper instantiator needed.
-    __ LoadImmediate(instantiator_reg,
-                     Smi::RawValue(StubCode::kNoInstantiator));
-    __ Bind(&instantiator_not_null);
-  }
+  ASSERT(type_arguments().IsRawInstantiatedRaw(type_arguments().Length()));
+  Label instantiator_not_null;
+  __ CompareImmediate(instantiator_reg,
+                      reinterpret_cast<intptr_t>(Object::null()));
+  __ b(&instantiator_not_null, NE);
+  // Null was used in VisitExtractConstructorTypeArguments as the
+  // instantiated type arguments, no proper instantiator needed.
+  __ LoadImmediate(instantiator_reg,
+                   Smi::RawValue(StubCode::kNoInstantiator));
+  __ Bind(&instantiator_not_null);
   // instantiator_reg: instantiator or kNoInstantiator.
 }
 
 
 LocationSummary* AllocateContextInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 0;
   const intptr_t kNumTemps = 1;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
   locs->set_temp(0, Location::RegisterLocation(R1));
@@ skipping 1181 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM