diff options
author | Michaël Zasso <targos@protonmail.com> | 2017-03-21 10:16:54 +0100 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2017-03-25 09:44:10 +0100 |
commit | c459d8ea5d402c702948c860d9497b2230ff7e8a (patch) | |
tree | 56c282fc4d40e5cb613b47cf7be3ea0526ed5b6f /deps/v8/src/compiler/frame.h | |
parent | e0bc5a7361b1d29c3ed034155fd779ce6f44fb13 (diff) | |
download | node-new-c459d8ea5d402c702948c860d9497b2230ff7e8a.tar.gz |
deps: update V8 to 5.7.492.69
PR-URL: https://github.com/nodejs/node/pull/11752
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Diffstat (limited to 'deps/v8/src/compiler/frame.h')
-rw-r--r-- | deps/v8/src/compiler/frame.h | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/deps/v8/src/compiler/frame.h b/deps/v8/src/compiler/frame.h index 8d463dfb78..a4d6829cfa 100644 --- a/deps/v8/src/compiler/frame.h +++ b/deps/v8/src/compiler/frame.h @@ -113,9 +113,9 @@ class Frame : public ZoneObject { int AllocateSpillSlot(int width) { int frame_slot_count_before = frame_slot_count_; - int slot = AllocateAlignedFrameSlot(width); - spill_slot_count_ += (frame_slot_count_ - frame_slot_count_before); - return slot; + AllocateAlignedFrameSlots(width); + spill_slot_count_ += frame_slot_count_ - frame_slot_count_before; + return frame_slot_count_ - 1; } int AlignFrame(int alignment = kDoubleSize); @@ -131,23 +131,15 @@ class Frame : public ZoneObject { static const int kJSFunctionSlot = 3 + StandardFrameConstants::kCPSlotCount; private: - int AllocateAlignedFrameSlot(int width) { - DCHECK(width == 4 || width == 8 || width == 16); - if (kPointerSize == 4) { - // Skip one slot if necessary. - if (width > kPointerSize) { - frame_slot_count_++; - frame_slot_count_ |= 1; - // 2 extra slots if width == 16. - frame_slot_count_ += (width & 16) / 8; - } - } else { - // No alignment when slots are 8 bytes. - DCHECK_EQ(8, kPointerSize); - // 1 extra slot if width == 16. - frame_slot_count_ += (width & 16) / 16; - } - return frame_slot_count_++; + void AllocateAlignedFrameSlots(int width) { + DCHECK_LT(0, width); + int new_frame_slots = (width + kPointerSize - 1) / kPointerSize; + // Align to 8 bytes if width is a multiple of 8 bytes, and to 16 bytes if + // multiple of 16. + int align_to = (width & 15) == 0 ? 16 : (width & 7) == 0 ? 8 : kPointerSize; + frame_slot_count_ = + RoundUp(frame_slot_count_ + new_frame_slots, align_to / kPointerSize); + DCHECK_LT(0, frame_slot_count_); } private: |