Get rid of ast node ids.

runtime/vm/flow_graph_compiler.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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 160 matching lines @@
 
 
 void FlowGraphCompiler::AddExceptionHandler(intptr_t try_index,
                                             intptr_t pc_offset) {
   exception_handlers_list_->AddHandler(try_index, pc_offset);
 }
 
 
 // Uses current pc position and try-index.
 void FlowGraphCompiler::AddCurrentDescriptor(PcDescriptors::Kind kind,
-                                             intptr_t cid,
+                                             intptr_t deopt_id,
                                              intptr_t token_pos,
                                              intptr_t try_index) {
   ASSERT((kind != PcDescriptors::kDeopt) ||
          frame_register_allocator()->IsSpilled());
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
-                                       cid,
+                                       deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
                                        intptr_t deopt_token_pos,
                                        intptr_t try_index,
                                        DeoptReasonId reason,
                                        Register reg1,
@@ skipping 93 matching lines @@
   // Even if an intrinsified version of the function was successfully
   // generated, it may fall through to the non-intrinsified method body.
   if (!FLAG_trace_functions) {
     return Intrinsifier::Intrinsify(parsed_function().function(), assembler());
   }
   return false;
 }
 
 
 void FlowGraphCompiler::GenerateInstanceCall(
-    intptr_t cid,
+    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) {
   ASSERT(!IsLeaf());
   ASSERT(frame_register_allocator()->IsSpilled());
   ICData& ic_data =
       ICData::ZoneHandle(ICData::New(parsed_function().function(),
                                      function_name,
-                                     cid,
+                                     deopt_id,
                                      checked_argument_count));
   const Array& arguments_descriptor =
       DartEntry::ArgumentsDescriptor(argument_count, argument_names);
   uword label_address = 0;
   switch (checked_argument_count) {
     case 1:
       label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
       break;
     case 2:
       label_address = StubCode::TwoArgsCheckInlineCacheEntryPoint();
       break;
     default:
       UNIMPLEMENTED();
   }
   ExternalLabel target_label("InlineCache", label_address);
 
   const intptr_t descr_offset = EmitInstanceCall(&target_label,
                                                  ic_data,
                                                  arguments_descriptor,
                                                  argument_count);
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kIcCall,
                                        descr_offset,
-                                       cid,
+                                       deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
-void FlowGraphCompiler::GenerateStaticCall(intptr_t cid,
+void FlowGraphCompiler::GenerateStaticCall(intptr_t deopt_id,
                                            intptr_t token_pos,
                                            intptr_t try_index,
                                            const Function& function,
                                            intptr_t argument_count,
                                            const Array& argument_names) {
   ASSERT(frame_register_allocator()->IsSpilled());
 
   const Array& arguments_descriptor =
       DartEntry::ArgumentsDescriptor(argument_count, argument_names);
   const intptr_t descr_offset = EmitStaticCall(function,
                                                arguments_descriptor,
                                                argument_count);
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kFuncCall,
                                        descr_offset,
-                                       cid,
+                                       deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
 void FlowGraphCompiler::GenerateNumberTypeCheck(Register kClassIdReg,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl) {
   GrowableArray<intptr_t> args;
@@ skipping 43 matching lines @@
   instr->PrintTo(&f);
   assembler()->Comment("%s", buffer);
 }
 
 
 void FlowGraphCompiler::EmitLoadIndexedGeneric(LoadIndexedComp* comp) {
   const String& function_name =
       String::ZoneHandle(Symbols::New(Token::Str(Token::kINDEX)));
 
   AddCurrentDescriptor(PcDescriptors::kDeopt,
-                       comp->cid(),
+                       comp->deopt_id(),
                        comp->token_pos(),
                        comp->try_index());
 
   const intptr_t kNumArguments = 2;
   const intptr_t kNumArgsChecked = 1;  // Type-feedback.
-  GenerateInstanceCall(comp->cid(),
+  GenerateInstanceCall(comp->deopt_id(),
                        comp->token_pos(),
                        comp->try_index(),
                        function_name,
                        kNumArguments,
                        Array::ZoneHandle(),  // No optional arguments.
                        kNumArgsChecked);
 }
 
 
 void FlowGraphCompiler::EmitTestAndCall(const ICData& ic_data,
                                         Register class_id_reg,
                                         intptr_t arg_count,
                                         const Array& arg_names,
                                         Label* deopt,
                                         Label* done,
-                                        intptr_t cid,
+                                        intptr_t deopt_id,
                                         intptr_t token_index,
                                         intptr_t try_index) {
   ASSERT(!ic_data.IsNull() && (ic_data.NumberOfChecks() > 0));
   Label match_found;
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
     const bool is_last_check = (i == (ic_data.NumberOfChecks() - 1));
     Label next_test;
     assembler()->cmpl(class_id_reg, Immediate(ic_data.GetReceiverClassIdAt(i)));
     if (is_last_check) {
       assembler()->j(NOT_EQUAL, deopt);
     } else {
       assembler()->j(NOT_EQUAL, &next_test);
     }
     const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(i));
-    GenerateStaticCall(cid,
+    GenerateStaticCall(deopt_id,
                        token_index,
                        try_index,
                        target,
                        arg_count,
                        arg_names);
     if (!is_last_check) {
       assembler()->jmp(&match_found);
     }
     assembler()->Bind(&next_test);
   }
@@ skipping 331 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart