commit 589d6979ff2ef66fca2d8fa51404c369ca5e9250
author Ben Murdoch <benm@google.com> Wed Nov 30 16:04:58 2011 +0000
committer Ben Murdoch <benm@google.com> Fri Dec 02 17:28:30 2011 +0000
tree 1d9032fcae9d18a05430a4ba9c14e5c635c4096e
parent 69a99ed0b2b2ef69d393c371b03db3a98aaf880e

Upgrade to V8 3.6

Merge V8 at 3.6.6.11

Simple merge required updates to makefiles only.

Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77

src/ia32/macro-assembler-ia32.h

diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h
index de9361d..1906644 100644
--- a/src/ia32/macro-assembler-ia32.h
+++ b/src/ia32/macro-assembler-ia32.h
@@ -437,7 +437,7 @@
 
   // Allocate a raw cons string object. Only the map field of the result is
   // initialized.
-  void AllocateConsString(Register result,
+  void AllocateTwoByteConsString(Register result,
                           Register scratch1,
                           Register scratch2,
                           Label* gc_required);
@@ -448,7 +448,7 @@
 
   // Allocate a raw sliced string object. Only the map field of the result is
   // initialized.
-  void AllocateSlicedString(Register result,
+  void AllocateTwoByteSlicedString(Register result,
                             Register scratch1,
                             Register scratch2,
                             Label* gc_required);