Index: src/compiler.h |
diff --git a/src/compiler.h b/src/compiler.h |
index 47d459a28206252581c9d4c35a2b0f42228864e8..d95514bcd67a740d04d17f30adb68bd301a14021 100644 |
--- a/src/compiler.h |
+++ b/src/compiler.h |
@@ -298,11 +298,15 @@ class CompilationInfo { |
} |
void AbortDueToDependencyChange() { |
- mode_ = DEPENDENCY_CHANGE_ABORT; |
+ ASSERT(!FLAG_parallel_recompilation || |
+ !isolate()->optimizing_compiler_thread()->IsOptimizerThread()); |
Jakob Kummerow
2013/08/12 13:48:24
IsOptimizerThread contains "if (!FLAG_parallel_rec
|
+ abort_due_to_map_dependency_ = true; |
Jakob Kummerow
2013/08/12 13:48:24
naming nit: could be any dependency change, not ju
|
} |
bool HasAbortedDueToDependencyChange() { |
- return mode_ == DEPENDENCY_CHANGE_ABORT; |
+ ASSERT(!FLAG_parallel_recompilation || |
+ !isolate()->optimizing_compiler_thread()->IsOptimizerThread()); |
+ return abort_due_to_map_dependency_; |
} |
protected: |
@@ -326,8 +330,7 @@ class CompilationInfo { |
BASE, |
OPTIMIZE, |
NONOPT, |
- STUB, |
- DEPENDENCY_CHANGE_ABORT |
+ STUB |
}; |
void Initialize(Isolate* isolate, Mode mode, Zone* zone); |
@@ -401,6 +404,9 @@ class CompilationInfo { |
Mode mode_; |
BailoutId osr_ast_id_; |
+ // Flag whether compilation needs to be aborted due to map dependency. |
+ bool abort_due_to_map_dependency_; |
+ |
// The zone from which the compilation pipeline working on this |
// CompilationInfo allocates. |
Zone* zone_; |