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

Unified Diff: src/compiler/pipeline.cc

Issue 1696043002: [runtime] Unify and simplify how frames are marked (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Tweaks Created 4 years, 10 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
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index 61cecab53cd6cdf583d291d1aabcb4304d2b6773..21361cbe0bfffcdfd31385af3484440fd4cd3c83 100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -280,10 +280,10 @@ class PipelineData {
DCHECK(frame_ == nullptr);
int fixed_frame_size = 0;
if (descriptor != nullptr) {
- fixed_frame_size = (descriptor->IsCFunctionCall())
- ? StandardFrameConstants::kFixedSlotCountAboveFp +
- StandardFrameConstants::kCPSlotCount
- : StandardFrameConstants::kFixedSlotCount;
+ fixed_frame_size = (((descriptor->flags() &
Benedikt Meurer 2016/02/22 18:16:38 Nit: For "flags" I'd prefer to not use explicit co
danno 2016/03/07 09:33:38 Done.
+ CallDescriptor::kHasStandardFrameHeader) != 0)
+ ? StandardFrameConstants::kFixedSlotCount
+ : TypedFrameConstants::kFixedSlotCount);
}
frame_ = new (instruction_zone()) Frame(fixed_frame_size, descriptor);
}

Powered by Google App Engine
This is Rietveld 408576698