commit 2b4ba1175df6a5a6b9b5cda034189197bf6565ec
author Ben Murdoch <benm@google.com> Fri Jan 20 14:57:15 2012 +0000
committer Ben Murdoch <benm@google.com> Fri Jan 20 14:57:15 2012 +0000
tree 6a4c479deebb22e68c5d7b915609593adee56a92
parent 35e02d4f35686cd3d202dab09aa0fdf24651afed

Merge V8 at r10446: Roll to 3.6.6.19

Bug: 5688872
Change-Id: Ie6be41e043db4e38abeb6b8d92761d7cc2c294bf

src/arm/code-stubs-arm.cc

diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index b2d5373..36450c9 100644
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -5363,7 +5363,7 @@
                                     Register hash,
                                     Register character) {
   // hash = character + (character << 10);
-  __ LoadRoot(hash, Heap::kStringHashSeedRootIndex);
+  __ LoadRoot(hash, Heap::kHashSeedRootIndex);
   // Untag smi seed and add the character.
   __ add(hash, character, Operand(hash, LSR, kSmiTagSize));
   // hash += hash << 10;