commit f3b273f5e6ffd2f6ba1c18a27a17db41dfb113c3
author Ben Murdoch <benm@google.com> Tue Jan 17 12:11:28 2017 +0000
committer Ben Murdoch <benm@google.com> Wed Jan 18 14:32:11 2017 +0000
tree e748f964837dfc9e4b961000ddacb2965c629d9f
parent a7e90cde16bf95fddae4a5156268e449da86ee36

Merge V8 5.5.372.32

Test: Manual, built and ran D8

Change-Id: I831a5491f74342c2675bb6fe1e24a2258e493758

src/interpreter/bytecode-flags.cc

diff --git a/src/interpreter/bytecode-flags.cc b/src/interpreter/bytecode-flags.cc
index 9b25dbd..158af13 100644
--- a/src/interpreter/bytecode-flags.cc
+++ b/src/interpreter/bytecode-flags.cc
@@ -11,6 +11,14 @@
 namespace interpreter {
 
 // static
+uint8_t CreateArrayLiteralFlags::Encode(bool use_fast_shallow_clone,
+                                        int runtime_flags) {
+  uint8_t result = FlagsBits::encode(runtime_flags);
+  result |= FastShallowCloneBit::encode(use_fast_shallow_clone);
+  return result;
+}
+
+// static
 uint8_t CreateObjectLiteralFlags::Encode(bool fast_clone_supported,
                                          int properties_count,
                                          int runtime_flags) {