MIPS: Fix 'Collect call counts for constructor calls, too.'

src/mips64/code-stubs-mips64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_MIPS64
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
@@ skipping 1973 matching lines @@
   __ Branch(&done_initialize_count);
 
   __ bind(&not_array_function);
 
   CreateWeakCellStub weak_cell_stub(masm->isolate());
   CallStubInRecordCallTarget(masm, &weak_cell_stub);
 
   __ bind(&done_initialize_count);
   // Initialize the call counter.
 
-  __ dsrl(a4, a3, 32 - kPointerSizeLog2);
+  __ SmiScale(a4, a3, kPointerSizeLog2);
   __ Daddu(a4, a2, Operand(a4));
   __ li(a5, Operand(Smi::FromInt(1)));
+  __ Branch(USE_DELAY_SLOT, &done);
   __ sd(a5, FieldMemOperand(a4, FixedArray::kHeaderSize + kPointerSize));
-  __ bind(&done);
 
   __ bind(&done_increment_count);
 
   // Increment the call count for monomorphic function calls.
-  __ dsrl(a4, a3, 32 - kPointerSizeLog2);
+  __ SmiScale(a4, a3, kPointerSizeLog2);
   __ Daddu(a5, a2, Operand(a4));
   __ ld(a4, FieldMemOperand(a5, FixedArray::kHeaderSize + kPointerSize));
   __ Daddu(a4, a4, Operand(Smi::FromInt(1)));
   __ sd(a4, FieldMemOperand(a5, FixedArray::kHeaderSize + kPointerSize));
 
   __ bind(&done);
 }
 
 
 void CallConstructStub::Generate(MacroAssembler* masm) {
@@ skipping 3652 matching lines @@
                            kStackUnwindSpace, kInvalidStackOffset,
                            return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64