Properly handle implicit closure function when a generic function.

runtime/vm/flow_graph_compiler_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 1071 matching lines @@
           __ StoreObject(Address(RBP, (slot_base - i) * kWordSize),
                          Object::empty_context());
         }
       } else {
         ASSERT(num_locals > 1);
         __ movq(Address(RBP, (slot_base - i) * kWordSize), RAX);
       }
     }
   }
 
+  if (FLAG_reify_generic_functions) {
+    // TODO(regis): Check function type arguments of a generic function.
+    // For now, verify that a local variable has been allocated when necessary.
+    ASSERT((function.NumTypeParameters() == 0) ||
+           (parsed_function().function_type_arguments() != NULL));
+    // TODO(regis): Allocate and prepend parent type arguments when necessary.
+    ASSERT(!function.HasGenericParent() ||
+           (parsed_function().parent_type_arguments() != NULL));
+  }

[siva, 2017/04/25 21:58:06]

Should this assert also happen on other architectures?

[regis, 2017/04/25 22:08:33]

I should probably not have committed these asserts, especially since
FLAG_reify_generic_functions is false by default and not working yet. They help
me verify my work in progress and are only temporary. Having them on x64 only is
good enough for now. Sorry for the sloppiness.

[siva, 2017/04/25 22:31:32]

Sounds good, no need to add to other targets yet, was just wondering about it.

+
   EndCodeSourceRange(TokenPosition::kDartCodePrologue);
   ASSERT(!block_order().is_empty());
   VisitBlocks();
 
   __ int3();
   ASSERT(assembler()->constant_pool_allowed());
   GenerateDeferredCode();
 }
 
 
@@ skipping 612 matching lines @@
   __ movups(reg, Address(RSP, 0));
   __ AddImmediate(RSP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64