Get rid of ast node ids.

runtime/vm/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/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 38 matching lines @@
   ASSERT(arguments.Count() == kCompileFunctionRuntimeEntry.argument_count());
   const Function& function = Function::CheckedHandle(arguments.At(0));
   ASSERT(!function.HasCode());
   const Error& error = Error::Handle(Compiler::CompileFunction(function));
   if (!error.IsNull()) {
     Exceptions::PropagateError(error);
   }
 }
 
 
-// Returns an array indexed by computation id, containing the extracted ICData.
+// Returns an array indexed by deopt id, containing the extracted ICData.
 static RawArray* ExtractTypeFeedbackArray(const Code& code) {
   ASSERT(!code.IsNull() && !code.is_optimized());
-  GrowableArray<intptr_t> computation_ids;
+  GrowableArray<intptr_t> deopt_ids;
   const GrowableObjectArray& ic_data_objs =
       GrowableObjectArray::Handle(GrowableObjectArray::New());
   const intptr_t max_id =
-      code.ExtractIcDataArraysAtCalls(&computation_ids, ic_data_objs);
+      code.ExtractIcDataArraysAtCalls(&deopt_ids, ic_data_objs);
   const Array& result = Array::Handle(Array::New(max_id + 1));
-  for (intptr_t i = 0; i < computation_ids.length(); i++) {
-    intptr_t result_index = computation_ids[i];
+  for (intptr_t i = 0; i < deopt_ids.length(); i++) {
+    intptr_t result_index = deopt_ids[i];
     ASSERT(result.At(result_index) == Object::null());
     result.SetAt(result_index, Object::Handle(ic_data_objs.At(i)));
   }
   return result.raw();
 }
 
 
 RawError* Compiler::Compile(const Library& library, const Script& script) {
   Isolate* isolate = Isolate::Current();
   LongJump* base = isolate->long_jump_base();
@@ skipping 42 matching lines @@
 }
 
 
 // Return false if bailed out.
 static bool CompileParsedFunctionHelper(
     const ParsedFunction& parsed_function, bool optimized, bool use_ssa) {
   TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
   bool is_compiled = false;
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate->ic_data_array() == Array::null());  // Must be reset to null.
-  const intptr_t prev_cid = isolate->computation_id();
-  isolate->set_computation_id(0);
+  const intptr_t prev_deopt_id = isolate->deopt_id();
+  isolate->set_deopt_id(0);
   LongJump* old_base = isolate->long_jump_base();
   LongJump bailout_jump;
   isolate->set_long_jump_base(&bailout_jump);
   if (setjmp(*bailout_jump.Set()) == 0) {
     GrowableArray<BlockEntryInstr*> block_order;
     // TimerScope needs an isolate to be properly terminated in case of a
     // LongJump.
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::graphbuilder_timer,
@@ skipping 99 matching lines @@
     if (FLAG_trace_bailout) {
       OS::Print("%s\n", bailout_error.ToErrorCString());
     }
     // We only bail out from generating ssa code.
     ASSERT(optimized && use_ssa);
     is_compiled = false;
   }
   // Reset global isolate state.
   isolate->set_ic_data_array(Array::null());
   isolate->set_long_jump_base(old_base);
-  isolate->set_computation_id(prev_cid);
+  isolate->set_deopt_id(prev_deopt_id);
   return is_compiled;
 }
 
 
 static RawError* CompileFunctionHelper(const Function& function,
                                        bool optimized) {
   Isolate* isolate = Isolate::Current();
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
@@ skipping 221 matching lines @@
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 
 }  // namespace dart