Merge V8 5.2.361.47 DO NOT MERGE
https://chromium.googlesource.com/v8/v8/+/5.2.361.47
FPIIM-449
Change-Id: Ibec421b85a9b88cb3a432ada642e469fe7e78346
(cherry picked from commit bcf72ee8e3b26f1d0726869c7ddb3921c68b09a8)
diff --git a/src/macro-assembler.h b/src/macro-assembler.h
index 6338b2c..b683045 100644
--- a/src/macro-assembler.h
+++ b/src/macro-assembler.h
@@ -19,21 +19,22 @@
enum AllocationFlags {
// No special flags.
NO_ALLOCATION_FLAGS = 0,
- // Return the pointer to the allocated already tagged as a heap object.
- TAG_OBJECT = 1 << 0,
// The content of the result register already contains the allocation top in
// new space.
- RESULT_CONTAINS_TOP = 1 << 1,
+ RESULT_CONTAINS_TOP = 1 << 0,
// Specify that the requested size of the space to allocate is specified in
// words instead of bytes.
- SIZE_IN_WORDS = 1 << 2,
+ SIZE_IN_WORDS = 1 << 1,
// Align the allocation to a multiple of kDoubleSize
- DOUBLE_ALIGNMENT = 1 << 3,
+ DOUBLE_ALIGNMENT = 1 << 2,
// Directly allocate in old space
- PRETENURE = 1 << 4,
+ PRETENURE = 1 << 3,
+ // Allocation folding dominator
+ ALLOCATION_FOLDING_DOMINATOR = 1 << 4,
+ // Folded allocation
+ ALLOCATION_FOLDED = 1 << 5
};
-
#if V8_TARGET_ARCH_IA32
#include "src/ia32/assembler-ia32.h"
#include "src/ia32/assembler-ia32-inl.h"