Index: src/full-codegen/mips/full-codegen-mips.cc |
diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc |
index 0bcfedbecc63a12edfba16ba64969851e5e3ad52..96a470c499885e124bd2f7ab7914b516f43a26b5 100644 |
--- a/src/full-codegen/mips/full-codegen-mips.cc |
+++ b/src/full-codegen/mips/full-codegen-mips.cc |
@@ -1040,9 +1040,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
// Check for proxies. |
Label call_runtime; |
- STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE); |
__ GetObjectType(a0, a1, a1); |
- __ Branch(&call_runtime, le, a1, Operand(LAST_JS_PROXY_TYPE)); |
+ __ Branch(&call_runtime, eq, a1, Operand(JS_PROXY_TYPE)); |
// Check cache validity in generated code. This is a fast case for |
// the JSObject::IsSimpleEnum cache validity checks. If we cannot |
@@ -1102,9 +1101,9 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) { |
__ li(a1, Operand(Smi::FromInt(1))); // Smi indicates slow check |
__ lw(a2, MemOperand(sp, 0 * kPointerSize)); // Get enumerated object |
- STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE); |
+ STATIC_ASSERT(JS_PROXY_TYPE == FIRST_JS_RECEIVER_TYPE); |
__ GetObjectType(a2, a3, a3); |
- __ Branch(&non_proxy, gt, a3, Operand(LAST_JS_PROXY_TYPE)); |
+ __ Branch(&non_proxy, gt, a3, Operand(JS_PROXY_TYPE)); |
__ li(a1, Operand(Smi::FromInt(0))); // Zero indicates proxy |
__ bind(&non_proxy); |
__ Push(a1, v0); // Smi and array |
@@ -3250,13 +3249,9 @@ void FullCodeGenerator::EmitIsJSProxy(CallRuntime* expr) { |
&if_false, &fall_through); |
__ JumpIfSmi(v0, if_false); |
- Register map = a1; |
- Register type_reg = a2; |
- __ GetObjectType(v0, map, type_reg); |
- __ Subu(type_reg, type_reg, Operand(FIRST_JS_PROXY_TYPE)); |
+ __ GetObjectType(v0, a1, a1); |
PrepareForBailoutBeforeSplit(expr, true, if_true, if_false); |
- Split(ls, type_reg, Operand(LAST_JS_PROXY_TYPE - FIRST_JS_PROXY_TYPE), |
- if_true, if_false, fall_through); |
+ Split(eq, a1, Operand(JS_PROXY_TYPE), if_true, if_false, fall_through); |
context()->Plug(if_true, if_false); |
} |