Second try: Fix resolution and canonicalization of typedefs and function types

runtime/vm/kernel_to_il.cc

 // Copyright (c) 2016, 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 <map>
 #include <set>
 #include <string>
 
 #include "vm/kernel_to_il.h"
 
@@ skipping 3935 matching lines @@
 void DartTypeTranslator::VisitFunctionType(FunctionType* node) {
   // The spec describes in section "19.1 Static Types":
   //
   //     Any use of a malformed type gives rise to a static warning. A
   //     malformed type is then interpreted as dynamic by the static type
   //     checker and the runtime unless explicitly specified otherwise.
   //
   // So we convert malformed return/parameter types to `dynamic`.
   TypeParameterScope scope(this, &node->type_parameters());
 
-  const Function& signature_function = Function::ZoneHandle(
+  Function& signature_function = Function::ZoneHandle(
       Z, Function::NewSignatureFunction(*active_class_->klass,
                                         TokenPosition::kNoSource));
 
   node->return_type()->AcceptDartTypeVisitor(this);
   if (result_.IsMalformed()) {
     result_ = AbstractType::dynamic_type().raw();
   }
   signature_function.set_result_type(result_);
 
   const intptr_t positional_count = node->positional_parameters().length();
@@ skipping 34 matching lines @@
     parameter_types.SetAt(pos, result_);
     parameter_names.SetAt(pos, H.DartSymbol(tuple->first()));
   }
 
   Type& signature_type =
       Type::ZoneHandle(Z, signature_function.SignatureType());
 
   if (finalize_) {
     signature_type ^= ClassFinalizer::FinalizeType(
         *active_class_->klass, signature_type, ClassFinalizer::kCanonicalize);
+    // Do not refer to signature_function anymore, since it may have been
+    // replaced during canonicalization.
+    signature_function = Function::null();
   }
-  signature_function.SetSignatureType(signature_type);

[regis, 2016/12/28 22:12:18]

This statement was setting the signature type on the replaced signature
function, triggering an assert.

 
   result_ = signature_type.raw();
 }
 
 
 static intptr_t FindTypeParameterIndex(List<TypeParameter>* parameters,
                                        TypeParameter* param) {
   for (intptr_t i = 0; i < parameters->length(); i++) {
     if (param == (*parameters)[i]) {
       return i;
@@ skipping 1814 matching lines @@
   instructions += LoadLocal(parsed_function_->current_context_var());
   instructions += StoreInstanceField(Closure::context_offset());
 
   return instructions;
 }
 
 
 }  // namespace kernel
 }  // namespace dart
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)