Revision: 24702
Author: [email protected]
Date: Fri Oct 17 15:50:51 2014 UTC
Log: Version 3.29.88.9 (merged r24361)
Fix data race when concurrent compilation is aborted due to dependency
change.
BUG=chromium:419189
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/639693006
https://code.google.com/p/v8/source/detail?r=24702
Modified:
/branches/3.29/src/compiler.cc
/branches/3.29/src/compiler.h
/branches/3.29/src/version.cc
=======================================
--- /branches/3.29/src/compiler.cc Thu Sep 25 00:05:09 2014 UTC
+++ /branches/3.29/src/compiler.cc Fri Oct 17 15:50:51 2014 UTC
@@ -52,7 +52,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(script->GetIsolate(), BASE, zone);
}
@@ -65,7 +66,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(isolate, STUB, zone);
}
@@ -80,7 +82,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(script_->GetIsolate(), BASE, zone);
}
@@ -96,7 +99,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(script_->GetIsolate(), BASE, zone);
}
@@ -109,7 +113,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(isolate, STUB, zone);
code_stub_ = stub;
}
@@ -126,7 +131,8 @@
parameter_count_(0),
optimization_id_(-1),
ast_value_factory_(NULL),
- ast_value_factory_owned_(false) {
+ ast_value_factory_owned_(false),
+ aborted_due_to_dependency_change_(false) {
Initialize(isolate, BASE, zone);
}
=======================================
--- /branches/3.29/src/compiler.h Thu Sep 25 00:05:09 2014 UTC
+++ /branches/3.29/src/compiler.h Fri Oct 17 15:50:51 2014 UTC
@@ -84,8 +84,7 @@
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 @@
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 @@
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);
};
=======================================
--- /branches/3.29/src/version.cc Tue Oct 14 08:52:50 2014 UTC
+++ /branches/3.29/src/version.cc Fri Oct 17 15:50:51 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 29
#define BUILD_NUMBER 88
-#define PATCH_LEVEL 8
+#define PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
