Revision: 24669
Author:   [email protected]
Date:     Thu Oct 16 17:24:15 2014 UTC
Log:      MIPS: Fix clang compilation error.

Port r24662 (4722032)

BUG=
[email protected]

Review URL: https://codereview.chromium.org/657413003
https://code.google.com/p/v8/source/detail?r=24669

Modified:
 /branches/bleeding_edge/src/mips64/code-stubs-mips64.cc

=======================================
--- /branches/bleeding_edge/src/mips64/code-stubs-mips64.cc Thu Oct 16 16:39:51 2014 UTC +++ /branches/bleeding_edge/src/mips64/code-stubs-mips64.cc Thu Oct 16 17:24:15 2014 UTC
@@ -2809,14 +2809,16 @@
   DCHECK(!a4.is(object_));

   // If the receiver is a smi trigger the non-string case.
-  __ JumpIfSmi(object_, receiver_not_string_);
+  if (check_mode_ == RECEIVER_IS_UNKNOWN) {
+    __ JumpIfSmi(object_, receiver_not_string_);

-  // Fetch the instance type of the receiver into result register.
-  __ ld(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
-  __ lbu(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
-  // If the receiver is not a string trigger the non-string case.
-  __ And(a4, result_, Operand(kIsNotStringMask));
-  __ Branch(receiver_not_string_, ne, a4, Operand(zero_reg));
+    // Fetch the instance type of the receiver into result register.
+    __ ld(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
+    __ lbu(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
+    // If the receiver is not a string trigger the non-string case.
+    __ And(a4, result_, Operand(kIsNotStringMask));
+    __ Branch(receiver_not_string_, ne, a4, Operand(zero_reg));
+  }

   // If the index is non-smi trigger the non-smi case.
   __ JumpIfNotSmi(index_, &index_not_smi_);

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to