Remove support for obsolete syntax of factory methods and default classes.

runtime/vm/code_generator_x64.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/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 2274 matching lines @@
   __ popq(CTX);
   // Result is in RAX.
   if (IsResultNeeded(node)) {
     __ pushq(RAX);
   }
 }
 
 
 // Pushes the type arguments of the instantiator on the stack.
 void CodeGenerator::GenerateInstantiatorTypeArguments(intptr_t token_index) {
-  Class& instantiator_class = Class::Handle();
-  Function& outer_function =
-      Function::Handle(parsed_function().function().raw());
-  while (outer_function.IsLocalFunction()) {
-    outer_function = outer_function.parent_function();
-  }
-  // TODO(regis): Remove support for type parameters on factories.
-  if (outer_function.IsFactory() &&
-      (outer_function.signature_class() != Class::null())) {
-    instantiator_class = outer_function.signature_class();
-  } else {
-    instantiator_class = outer_function.owner();
-  }
+  const Class& instantiator_class = Class::Handle(
+      parsed_function().function().owner());
   if (instantiator_class.NumTypeParameters() == 0) {
     // The type arguments are compile time constants.
     AbstractTypeArguments& type_arguments = AbstractTypeArguments::ZoneHandle();
     // TODO(regis): Temporary type should be allocated in new gen heap.
     Type& type = Type::Handle(
         Type::NewParameterizedType(instantiator_class, type_arguments));
     Error& error = Error::Handle();
     type ^= ClassFinalizer::FinalizeAndCanonicalizeType(instantiator_class,
                                                         type,
                                                         &error);
     if (!error.IsNull()) {
       ErrorMsg(token_index, error.ToErrorCString());
     }
     type_arguments = type.arguments();
     __ PushObject(type_arguments);
   } else {
     ASSERT(parsed_function().instantiator() != NULL);
     parsed_function().instantiator()->Visit(this);
+    Function& outer_function =
+        Function::Handle(parsed_function().function().raw());
+    while (outer_function.IsLocalFunction()) {
+      outer_function = outer_function.parent_function();
+    }
     if (!outer_function.IsFactory()) {
       __ popq(RAX);  // Pop instantiator.
       // The instantiator is the receiver of the caller, which is not a factory.
       // The receiver cannot be null; extract its AbstractTypeArguments object.
       // Note that in the factory case, the instantiator is the first parameter
       // of the factory, i.e. already an AbstractTypeArguments object.
       intptr_t type_arguments_instance_field_offset =
           instantiator_class.type_arguments_instance_field_offset();
       ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
       __ movq(RAX, FieldAddress(RAX, type_arguments_instance_field_offset));
@@ skipping 464 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64