Properly support undefined->0 conversion in ia32 bitwise BinaryOpStubs (regression fix for r13624)

src/ia32/code-stubs-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2749 matching lines @@
   __ bind(&check_undefined_arg1);
   Factory* factory = masm->isolate()->factory();
   __ cmp(edx, factory->undefined_value());
   __ j(not_equal, conversion_failure);
   __ mov(edx, Immediate(0));
   __ jmp(&load_arg2);
 
   __ bind(&arg1_is_object);
   __ mov(ebx, FieldOperand(edx, HeapObject::kMapOffset));
   __ cmp(ebx, factory->heap_number_map());
+  __ j(not_equal, &check_undefined_arg1);
+
+  // Get the untagged integer version of the edx heap number in ecx.
   if (left_type == BinaryOpIC::INT32 && CpuFeatures::IsSupported(SSE2)) {
     CpuFeatures::Scope use_sse2(SSE2);
-    __ j(not_equal, conversion_failure);
-    // Get the untagged integer version of the edx heap number in ecx.
     ConvertHeapNumberToInt32(masm, edx, conversion_failure);
   } else {
-    __ j(not_equal, &check_undefined_arg1);
-    // Get the untagged integer version of the edx heap number in ecx.
     IntegerConvert(masm, edx, use_sse3, conversion_failure);
   }
   __ mov(edx, ecx);
 
   // Here edx has the untagged integer, eax has a Smi or a heap number.
   __ bind(&load_arg2);
 
   // Test if arg2 is a Smi.
   if (right_type == BinaryOpIC::SMI) {
     __ JumpIfNotSmi(eax, conversion_failure);
   } else {
     __ JumpIfNotSmi(eax, &arg2_is_object, Label::kNear);
   }
 
   __ SmiUntag(eax);
   __ mov(ecx, eax);
   __ jmp(&done);
 
   // If the argument is undefined it converts to zero (ECMA-262, section 9.5).
   __ bind(&check_undefined_arg2);
   __ cmp(eax, factory->undefined_value());
   __ j(not_equal, conversion_failure);
   __ mov(ecx, Immediate(0));
   __ jmp(&done);
 
   __ bind(&arg2_is_object);
   __ mov(ebx, FieldOperand(eax, HeapObject::kMapOffset));
   __ cmp(ebx, factory->heap_number_map());
+  __ j(not_equal, &check_undefined_arg2);
+  // Get the untagged integer version of the eax heap number in ecx.
+
   if (right_type == BinaryOpIC::INT32 && CpuFeatures::IsSupported(SSE2)) {
     CpuFeatures::Scope use_sse2(SSE2);
-    __ j(not_equal, conversion_failure);
-    // Get the untagged integer version of the eax heap number in ecx.
     ConvertHeapNumberToInt32(masm, eax, conversion_failure);
   } else {
-    __ j(not_equal, &check_undefined_arg2);
-    // Get the untagged integer version of the eax heap number in ecx.
     IntegerConvert(masm, eax, use_sse3, conversion_failure);
   }
 
   __ bind(&done);
   __ mov(eax, edx);
 }
 
 
 void FloatingPointHelper::LoadFloatOperand(MacroAssembler* masm,
                                            Register number) {
@@ skipping 4874 matching lines @@
   // Restore ecx.
   __ pop(ecx);
   __ ret(0);
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32