Version 3.29.88.9 (merged r24361)

src/compiler.h

Index: src/compiler.h
diff --git a/src/compiler.h b/src/compiler.h
index 9617afc9f3c8729a5e375f8a99f2b9bc677012d3..8c4177197eb3ee8168e1d679198197b554a4ed74 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -84,8 +84,7 @@ class CompilationInfo {
     kContextSpecializing = 1 << 16,
     kInliningEnabled = 1 << 17,
     kTypingEnabled = 1 << 18,
-    kDisableFutureOptimization = 1 << 19,
-    kAbortedDueToDependency = 1 << 20
+    kDisableFutureOptimization = 1 << 19
   };
 
   CompilationInfo(Handle<JSFunction> closure, Zone* zone);
@@ -366,12 +365,12 @@ class CompilationInfo {
 
   void AbortDueToDependencyChange() {
     DCHECK(!OptimizingCompilerThread::IsOptimizerThread(isolate()));
-    SetFlag(kAbortedDueToDependency);
+    aborted_due_to_dependency_change_ = true;
   }
 
   bool HasAbortedDueToDependencyChange() const {
     DCHECK(!OptimizingCompilerThread::IsOptimizerThread(isolate()));
-    return GetFlag(kAbortedDueToDependency);
+    return aborted_due_to_dependency_change_;
   }
 
   bool HasSameOsrEntry(Handle<JSFunction> function, BailoutId osr_ast_id) {
@@ -510,6 +509,10 @@ class CompilationInfo {
   bool ast_value_factory_owned_;
   AstNode::IdGen ast_node_id_gen_;
 
+  // This flag is used by the main thread to track whether this compilation
+  // should be abandoned due to dependency change.
+  bool aborted_due_to_dependency_change_;
+
   DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
 };