RFC: Switch to ast ids (instead of positions) for type feedback.

src/runtime.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 6700 matching lines @@
   HandleScope scope;
   ASSERT(args.length() == 1);
   Handle<JSFunction> function = args.at<JSFunction>(0);
   // If the function is not optimizable or debugger is active continue using the
   // code from the full compiler.
   if (!function->shared()->code()->optimizable() ||
       Debug::has_break_points()) {
     function->ReplaceCode(function->shared()->code());
     return function->code();
   }
-  if (CompileOptimized(function, AstNode::kNoNumber)) {
+  if (CompileOptimized(function, kNoAstId)) {
     return function->code();
   }
   function->ReplaceCode(function->shared()->code());
   return Failure::Exception();
 }
 
 
 static MaybeObject* Runtime_NotifyDeoptimized(Arguments args) {
   HandleScope scope;
   ASSERT(args.length() == 1);
@@ skipping 107 matching lines @@
     // deoptimized so that we are currently in an unoptimized activation.
     // Check for optimized activations of this function.
     JavaScriptFrameIterator it;
     while (succeeded && !it.done()) {
       JavaScriptFrame* frame = it.frame();
       succeeded = !frame->is_optimized() || frame->function() != *function;
       it.Advance();
     }
   }
 
-  int ast_id = AstNode::kNoNumber;
+  AstId ast_id = kNoAstId;
   if (succeeded) {
     // The top JS function is this one, the PC is somewhere in the
     // unoptimized code.
     JavaScriptFrameIterator it;
     JavaScriptFrame* frame = it.frame();
     ASSERT(frame->function() == *function);
     ASSERT(frame->code() == *unoptimized);
     ASSERT(unoptimized->contains(frame->pc()));
 
     // Use linear search of the unoptimized code's stack check table to find
     // the AST id matching the PC.
     Address start = unoptimized->instruction_start();
     unsigned target_pc_offset = static_cast<unsigned>(frame->pc() - start);
     Address table_cursor = start + unoptimized->stack_check_table_start();
     uint32_t table_length = Memory::uint32_at(table_cursor);
     table_cursor += kIntSize;
     for (unsigned i = 0; i < table_length; ++i) {
       // Table entries are (AST id, pc offset) pairs.
       uint32_t pc_offset = Memory::uint32_at(table_cursor + kIntSize);
       if (pc_offset == target_pc_offset) {
-        ast_id = static_cast<int>(Memory::uint32_at(table_cursor));
+        ast_id = static_cast<AstId>(Memory::uint32_at(table_cursor));
         break;
       }
       table_cursor += 2 * kIntSize;
     }
-    ASSERT(ast_id != AstNode::kNoNumber);
+    ASSERT(ast_id != kNoAstId);
     if (FLAG_trace_osr) {
       PrintF("[replacing on-stack at AST id %d in ", ast_id);
       function->PrintName();
       PrintF("]\n");
     }
 
     // Try to compile the optimized code.  A true return value from
     // CompileOptimized means that compilation succeeded, not necessarily
     // that optimization succeeded.
     if (CompileOptimized(function, ast_id) && function->IsOptimized()) {
       DeoptimizationInputData* data = DeoptimizationInputData::cast(
           function->code()->deoptimization_data());
       if (FLAG_trace_osr) {
         PrintF("[on-stack replacement offset %d in optimized code]\n",
                data->OsrPcOffset()->value());
       }
-      ASSERT(data->OsrAstId()->value() == ast_id);
+      ASSERT(static_cast<AstId>(data->OsrAstId()->value()) == ast_id);
       ASSERT(data->OsrPcOffset()->value() >= 0);
     } else {
       succeeded = false;
     }
   }
 
   // Revert to the original stack checks in the original unoptimized code.
   if (FLAG_trace_osr) {
     PrintF("[restoring original stack checks in ");
     function->PrintName();
@@ skipping 3875 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     Counters::gc_last_resort_from_js.Increment();
     Heap::CollectAllGarbage(false);
   }
 }
 
 
 } }  // namespace v8::internal