Reviewers: Jakob,

Description:
Expect and check for dependency change during code generation.

R=jkumme...@chromium.org
BUG=

Please review this at https://codereview.chromium.org/23064003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/compiler.cc


Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index f6e5daac854228dec0381fdd64b317330109833b..f1c89b7e2cd1b05b9c4a666a6c703d50f1feff01 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -483,7 +483,6 @@ OptimizingCompiler::Status OptimizingCompiler::OptimizeGraph() {
 OptimizingCompiler::Status OptimizingCompiler::GenerateAndInstallCode() {
   ASSERT(last_status() == SUCCEEDED);
   ASSERT(!info()->HasAbortedDueToDependencyChange());
-  DisallowCodeDependencyChange no_dependency_change;
   {  // Scope for timer.
     Timer timer(this, &time_taken_to_codegen_);
     ASSERT(chunk_ != NULL);
@@ -500,6 +499,11 @@ OptimizingCompiler::Status OptimizingCompiler::GenerateAndInstallCode() {
       }
       return AbortOptimization();
     }
+    if (info()->HasAbortedDueToDependencyChange()) {
+      info_->set_bailout_reason(kBailedOutDueToDependencyChange);
+      info_->AbortOptimization();
+      return SetLastStatus(BAILED_OUT);
+    }
     info()->SetCode(optimized_code);
   }
   RecordOptimizationStats();


--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to