Introduced TypeFeedbackId and BailoutId types.

src/compiler.h

Index: src/compiler.h
diff --git a/src/compiler.h b/src/compiler.h
index 5465a2dedab84e97533b7003115afc9b362ffb4c..7a227bc9fcabc846c1b3277eb474d557f0c81b9b 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -73,7 +73,7 @@ class CompilationInfo {
   v8::Extension* extension() const { return extension_; }
   ScriptDataImpl* pre_parse_data() const { return pre_parse_data_; }
   Handle<Context> calling_context() const { return calling_context_; }
-  int osr_ast_id() const { return osr_ast_id_; }
+  BailoutId osr_ast_id() const { return osr_ast_id_; }
 
   void MarkAsEval() {
     ASSERT(!is_lazy());
@@ -124,10 +124,6 @@ class CompilationInfo {
     ASSERT(is_eval());
     calling_context_ = context;
   }
-  void SetOsrAstId(int osr_ast_id) {
-    ASSERT(IsOptimizing());
-    osr_ast_id_ = osr_ast_id;
-  }
   void MarkCompilingForDebugging(Handle<Code> current_code) {
     ASSERT(mode_ != OPTIMIZE);
     ASSERT(current_code->kind() == Code::FUNCTION);
@@ -153,7 +149,7 @@ class CompilationInfo {
   // Accessors for the different compilation modes.
   bool IsOptimizing() const { return mode_ == OPTIMIZE; }
   bool IsOptimizable() const { return mode_ == BASE; }
-  void SetOptimizing(int osr_ast_id) {
+  void SetOptimizing(BailoutId osr_ast_id) {
     SetMode(OPTIMIZE);
     osr_ast_id_ = osr_ast_id;
   }
@@ -267,7 +263,7 @@ class CompilationInfo {
 
   // Compilation mode flag and whether deoptimization is allowed.
   Mode mode_;
-  int osr_ast_id_;
+  BailoutId osr_ast_id_;
 
   // The zone from which the compilation pipeline working on this
   // CompilationInfo allocates.