Get rid of ast node ids.

runtime/vm/flow_graph_compiler_x64.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_FLOW_GRAPH_COMPILER_X64_H_
 #define VM_FLOW_GRAPH_COMPILER_X64_H_
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #error Include flow_graph_compiler.h instead of flow_graph_compiler_x64.h.
 #endif
@@ skipping 59 matching lines @@
 
   void LoadDoubleOrSmiToXmm(XmmRegister result,
                             Register reg,
                             Register temp,
                             Label* not_double_or_smi);
 
   // Returns 'true' if code generation for this function is complete, i.e.,
   // no fall-through to regular code is needed.
   bool TryIntrinsify();
 
-  void GenerateCallRuntime(intptr_t cid,
+  void GenerateCallRuntime(intptr_t deopt_id,
                            intptr_t token_pos,
                            intptr_t try_index,
                            const RuntimeEntry& entry);
 
   void GenerateCall(intptr_t token_pos,
                     intptr_t try_index,
                     const ExternalLabel* label,
                     PcDescriptors::Kind kind);
 
-  void GenerateAssertAssignable(intptr_t cid,
+  void GenerateAssertAssignable(intptr_t deopt_id,
                                 intptr_t token_pos,
                                 intptr_t try_index,
                                 const AbstractType& dst_type,
                                 const String& dst_name);
 
-  void GenerateInstanceOf(intptr_t cid,
+  void GenerateInstanceOf(intptr_t deopt_id,
                           intptr_t token_pos,
                           intptr_t try_index,
                           const AbstractType& type,
                           bool negate_result);
 
-  void GenerateInstanceCall(intptr_t cid,
+  void GenerateInstanceCall(intptr_t deopt_id,
                             intptr_t token_pos,
                             intptr_t try_index,
                             const String& function_name,
                             intptr_t argument_count,
                             const Array& argument_names,
                             intptr_t checked_argument_count);
 
-  void GenerateStaticCall(intptr_t cid,
+  void GenerateStaticCall(intptr_t deopt_id,
                           intptr_t token_pos,
                           intptr_t try_index,
                           const Function& function,
                           intptr_t argument_count,
                           const Array& argument_names);
 
   void GenerateInlinedMathSqrt(Label* done);
 
   void GenerateNumberTypeCheck(Register kClassIdReg,
                                const AbstractType& type,
@@ skipping 18 matching lines @@
                             const ICData& ic_data,
                             const Array& arguments_descriptor,
                             intptr_t argument_count);
 
   void EmitLoadIndexedGeneric(LoadIndexedComp* comp);
   void EmitTestAndCall(const ICData& ic_data,
                        Register class_id_reg,
                        intptr_t arg_count,
                        const Array& arg_names,
                        Label* deopt,
-                       Label* done,
-                       intptr_t cid,
+                       Label* done,  // Can be NULL, which means fallthrough.
+                       intptr_t deopt_id,
                        intptr_t token_index,
                        intptr_t try_index);
 
   void EmitDoubleCompareBranch(Condition true_condition,
                                XmmRegister left,
                                XmmRegister right,
                                BranchInstr* branch);
   void EmitDoubleCompareBool(Condition true_condition,
                              XmmRegister left,
                              XmmRegister right,
                              Register result);
 
   intptr_t StackSize() const;
 
   // Returns assembler label associated with the given block entry.
   Label* GetBlockLabel(BlockEntryInstr* block_entry) const;
 
   // Returns true if there is a next block after the current one in
   // the block order and if it is the given block.
   bool IsNextBlock(BlockEntryInstr* block_entry) const;
 
   void AddExceptionHandler(intptr_t try_index, intptr_t pc_offset);
   void AddCurrentDescriptor(PcDescriptors::Kind kind,
-                            intptr_t cid,
+                            intptr_t deopt_id,
                             intptr_t token_pos,
                             intptr_t try_index);
   Label* AddDeoptStub(intptr_t deopt_id,
                       intptr_t deopt_token_pos,
                       intptr_t try_index_,
                       DeoptReasonId reason,
                       Register reg1 = kNoRegister,
                       Register reg2 = kNoRegister,
                       Register reg3 = kNoRegister);
 
@@ skipping 28 matching lines @@
   intptr_t EmitStaticCall(const Function& function,
                           const Array& arguments_descriptor,
                           intptr_t argument_count);
 
   // Type checking helper methods.
   void CheckClassIds(Register class_id_reg,
                      const GrowableArray<intptr_t>& class_ids,
                      Label* is_instance_lbl,
                      Label* is_not_instance_lbl);
 
-  RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t cid,
-                                                intptr_t token_pos,
+  RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t token_pos,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl);
 
   RawSubtypeTestCache* GenerateInstantiatedTypeWithArgumentsTest(
-      intptr_t cid,
       intptr_t token_pos,
       const AbstractType& dst_type,
       Label* is_instance_lbl,
       Label* is_not_instance_lbl);
 
-  bool GenerateInstantiatedTypeNoArgumentsTest(intptr_t cid,
-                                               intptr_t token_pos,
+  bool GenerateInstantiatedTypeNoArgumentsTest(intptr_t token_pos,
                                                const AbstractType& dst_type,
                                                Label* is_instance_lbl,
                                                Label* is_not_instance_lbl);
 
   RawSubtypeTestCache* GenerateUninstantiatedTypeTest(
-      intptr_t cid,
       intptr_t token_pos,
       const AbstractType& dst_type,
       Label* is_instance_lbl,
       Label* is_not_instance_label);
 
   RawSubtypeTestCache* GenerateSubtype1TestCacheLookup(
-      intptr_t cid,
       intptr_t token_pos,
       const Class& type_class,
       Label* is_instance_lbl,
       Label* is_not_instance_lbl);
 
   enum TypeTestStubKind {
     kTestTypeOneArg,
     kTestTypeTwoArgs,
     kTestTypeThreeArgs,
   };
@@ skipping 52 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_X64_H_