MIPS: Add kExpectedFixedArrayInRegisterA2 message.
authorpalfia@homejinni.com <palfia@homejinni.com@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Tue, 11 Feb 2014 09:27:01 +0000 (09:27 +0000)
committerpalfia@homejinni.com <palfia@homejinni.com@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Tue, 11 Feb 2014 09:27:01 +0000 (09:27 +0000)
Port r19244 (08e0afd9)

BUG=
R=mvstanton@chromium.org, plind44@gmail.com

Review URL: https://codereview.chromium.org/159423003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19263 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/mips/code-stubs-mips.cc
src/objects.h

index 1d05dce..3d4d605 100644 (file)
@@ -5511,7 +5511,7 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) {
     __ LoadRoot(at, Heap::kUndefinedValueRootIndex);
     __ Branch(&okay_here, eq, a2, Operand(at));
     __ lw(t0, FieldMemOperand(a2, 0));
-    __ Assert(eq, kExpectedFixedArrayInRegisterR2,
+    __ Assert(eq, kExpectedFixedArrayInRegisterA2,
         t0, Operand(fixed_array_map));
 
     // a3 should be a smi if we don't have undefined in a2
index 2a081a5..8144e0d 100644 (file)
@@ -1146,8 +1146,8 @@ class MaybeObject BASE_EMBEDDED {
   V(kExpected0AsASmiSentinel, "Expected 0 as a Smi sentinel")                 \
   V(kExpectedAlignmentMarker, "expected alignment marker")                    \
   V(kExpectedAllocationSite, "expected allocation site")                      \
-  V(kExpectedPropertyCellInRegisterA2,                                        \
-    "Expected property cell in register a2")                                  \
+  V(kExpectedFixedArrayInRegisterA2,                                          \
+    "Expected fixed array in register a2")                                    \
   V(kExpectedFixedArrayInRegisterEbx,                                         \
     "Expected fixed array in register ebx")                                   \
   V(kExpectedFixedArrayInRegisterR2,                                          \