Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: src/frames.cc

Issue 426233002: Land the Fan (disabled) (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Review feedback, rebase and "git cl format" Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/flag-definitions.h ('k') | src/gdb-jit.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index 7a675cfd443d7138f5982737d511e1a47263810d..1a5993d9dd32203cd182517d98749cbc2bf7a81b 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -931,6 +931,12 @@ void OptimizedFrame::Summarize(List<FrameSummary>* frames) {
ASSERT(frames->length() == 0);
ASSERT(is_optimized());
+ // Delegate to JS frame in absence of inlining.
+ // TODO(turbofan): Revisit once we support inlining.
+ if (LookupCode()->is_turbofanned()) {
+ return JavaScriptFrame::Summarize(frames);
+ }
+
int deopt_index = Safepoint::kNoDeoptimizationIndex;
DeoptimizationInputData* data = GetDeoptimizationData(&deopt_index);
FixedArray* literal_array = data->LiteralArray();
@@ -940,10 +946,7 @@ void OptimizedFrame::Summarize(List<FrameSummary>* frames) {
// throw. An entry with no deoptimization index indicates a call-site
// without a lazy-deopt. As a consequence we are not allowed to inline
// functions containing throw.
- if (deopt_index == Safepoint::kNoDeoptimizationIndex) {
- JavaScriptFrame::Summarize(frames);
- return;
- }
+ ASSERT(deopt_index != Safepoint::kNoDeoptimizationIndex);
TranslationIterator it(data->TranslationByteArray(),
data->TranslationIndex(deopt_index)->value());
@@ -1055,6 +1058,12 @@ DeoptimizationInputData* OptimizedFrame::GetDeoptimizationData(
int OptimizedFrame::GetInlineCount() {
ASSERT(is_optimized());
+ // Delegate to JS frame in absence of inlining.
+ // TODO(turbofan): Revisit once we support inlining.
+ if (LookupCode()->is_turbofanned()) {
+ return JavaScriptFrame::GetInlineCount();
+ }
+
int deopt_index = Safepoint::kNoDeoptimizationIndex;
DeoptimizationInputData* data = GetDeoptimizationData(&deopt_index);
@@ -1073,6 +1082,12 @@ void OptimizedFrame::GetFunctions(List<JSFunction*>* functions) {
ASSERT(functions->length() == 0);
ASSERT(is_optimized());
+ // Delegate to JS frame in absence of inlining.
+ // TODO(turbofan): Revisit once we support inlining.
+ if (LookupCode()->is_turbofanned()) {
+ return JavaScriptFrame::GetFunctions(functions);
+ }
+
int deopt_index = Safepoint::kNoDeoptimizationIndex;
DeoptimizationInputData* data = GetDeoptimizationData(&deopt_index);
FixedArray* literal_array = data->LiteralArray();
« no previous file with comments | « src/flag-definitions.h ('k') | src/gdb-jit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698