commit 3c6783109ce9167345ebcf5858e794b3a913b9ef
author Michael Hablich <hablich@chromium.org> Mon Apr 11 10:49:45 2016
committer Michael Hablich <hablich@chromium.org> Mon Apr 11 10:52:11 2016
tree 854a7093f694220e331e7e3b2b6293c3a6145e00
parent d9c1109395f673b57af2ed388d2e17b7728fcd43

Version 5.0.71.32 (cherry-pick)

Merged 946354a7af0b328673ff3b7d7c08ab27c264a2b1

Ensure no lazy deopts into TurboFan code with deopt entries with no AstID

BUG=595259
LOG=N
R=jarin@chromium.org, danno@chromium.org

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

Cr-Commit-Position: refs/branch-heads/5.0@{#39}
Cr-Branched-From: ad16e6c2cbd2c6b0f2e8ff944ac245561c682ac2-refs/heads/5.0.71@{#1}
Cr-Branched-From: bd9df50d75125ee2ad37b3d92c8f50f0a8b5f030-refs/heads/master@{#34215}

include/v8-version.h

diff --git a/include/v8-version.h b/include/v8-version.h
index 6e3adda..3d41a2c 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 0
 #define V8_BUILD_NUMBER 71
-#define V8_PATCH_LEVEL 31
+#define V8_PATCH_LEVEL 32
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

src/objects.cc

diff --git a/src/objects.cc b/src/objects.cc
index 99a0bf1..67a5963 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -14585,7 +14585,9 @@
   for (int i = 0; i < deopt_data->DeoptCount(); i++) {
     if (deopt_data->Pc(i)->value() == -1) continue;
     Address address = code_start_address + deopt_data->Pc(i)->value();
-    if (address == pc) return true;
+    if (address == pc && deopt_data->AstId(i) != BailoutId::None()) {
+      return true;
+    }
   }
   return false;
 }