1 files changed, 7 insertions, 16 deletions

diff --git a/chromium/v8/src/compiler.h b/chromium/v8/src/compiler.h
index 7d442f9d461..d36e488b174 100644
--- a/chromium/v8/src/compiler.h
+++ b/chromium/v8/src/compiler.h
@@ -199,11 +199,6 @@ class CompilationInfo {
     return IsCompilingForDebugging::decode(flags_);
   }
 
-  bool ShouldTrapOnDeopt() const {
-    return (FLAG_trap_on_deopt && IsOptimizing()) ||
-        (FLAG_trap_on_stub_deopt && IsStub());
-  }
-
   bool has_global_object() const {
     return !closure().is_null() &&
         (closure()->context()->global_object() != NULL);
@@ -263,8 +258,8 @@ class CompilationInfo {
     SaveHandle(&script_);
   }
 
-  BailoutReason bailout_reason() const { return bailout_reason_; }
-  void set_bailout_reason(BailoutReason reason) { bailout_reason_ = reason; }
+  const char* bailout_reason() const { return bailout_reason_; }
+  void set_bailout_reason(const char* reason) { bailout_reason_ = reason; }
 
   int prologue_offset() const {
     ASSERT_NE(kPrologueOffsetNotSet, prologue_offset_);
@@ -298,13 +293,11 @@ class CompilationInfo {
   }
 
   void AbortDueToDependencyChange() {
-    ASSERT(!isolate()->optimizing_compiler_thread()->IsOptimizerThread());
-    abort_due_to_dependency_ = true;
+    mode_ = DEPENDENCY_CHANGE_ABORT;
   }
 
   bool HasAbortedDueToDependencyChange() {
-    ASSERT(!isolate()->optimizing_compiler_thread()->IsOptimizerThread());
-    return abort_due_to_dependency_;
+    return mode_ == DEPENDENCY_CHANGE_ABORT;
   }
 
  protected:
@@ -328,7 +321,8 @@ class CompilationInfo {
     BASE,
     OPTIMIZE,
     NONOPT,
-    STUB
+    STUB,
+    DEPENDENCY_CHANGE_ABORT
   };
 
   void Initialize(Isolate* isolate, Mode mode, Zone* zone);
@@ -402,9 +396,6 @@ class CompilationInfo {
   Mode mode_;
   BailoutId osr_ast_id_;
 
-  // Flag whether compilation needs to be aborted due to dependency change.
-  bool abort_due_to_dependency_;
-
   // The zone from which the compilation pipeline working on this
   // CompilationInfo allocates.
   Zone* zone_;
@@ -421,7 +412,7 @@ class CompilationInfo {
     }
   }
 
-  BailoutReason bailout_reason_;
+  const char* bailout_reason_;
 
   int prologue_offset_;