Merge bleeding_edge 17696:18016.

src/frames.cc

Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index 167277f799617974fdd08c84e7fc71a0f5005610..912c822d1789c4b1e9b64133ea4428498c376f93 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -38,8 +38,6 @@
 #include "string-stream.h"
 #include "vm-state-inl.h"
 
-#include "allocation-inl.h"
-
 namespace v8 {
 namespace internal {
 
@@ -1401,6 +1399,11 @@ Code* StubFailureTrampolineFrame::unchecked_code() const {
     return trampoline;
   }
 
+  StubFailureTailCallTrampolineStub().FindCodeInCache(&trampoline, isolate());
+  if (trampoline->contains(pc())) {
+    return trampoline;
+  }
+
   UNREACHABLE();
   return NULL;
 }