Temporarily skip escape analysis when compiling for OSR.

R=jkummerow@chromium.org
TEST=mjsunit/compiler/escape-analysis --stress-compaction

Review URL: https://codereview.chromium.org/23480028

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16499 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/hydrogen-escape-analysis.cc b/src/hydrogen-escape-analysis.cc
index 0e70bcd..00cfe27 100644 (file)
--- a/src/hydrogen-escape-analysis.cc
+++ b/src/hydrogen-escape-analysis.cc
@@ -306,4 +306,13 @@ void HEscapeAnalysisPhase::PerformScalarReplacement() {
 }
 
 
+void HEscapeAnalysisPhase::Run() {
+  // TODO(mstarzinger): We disable escape analysis with OSR for now, because
+  // spill slots might be uninitialized. Needs investigation.
+  if (graph()->has_osr()) return;
+  CollectCapturedValues();
+  PerformScalarReplacement();
+}
+
+
 } }  // namespace v8::internal

diff --git a/src/hydrogen-escape-analysis.h b/src/hydrogen-escape-analysis.h
index 639f5a9..311a653 100644 (file)
--- a/src/hydrogen-escape-analysis.h
+++ b/src/hydrogen-escape-analysis.h
@@ -45,10 +45,7 @@ class HEscapeAnalysisPhase : public HPhase {
         cumulative_values_(0),
         block_states_(graph->blocks()->length(), zone()) { }
 
-  void Run() {
-    CollectCapturedValues();
-    PerformScalarReplacement();
-  }
+  void Run();
 
  private:
   void CollectCapturedValues();