Fixed Hydrogen environment handling for mul-i on ARM and ARM64.

src/arm64/lithium-arm64.cc

 // Copyright 2013 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.
 
 #include <sstream>
 
 #include "src/v8.h"
 
 #include "src/arm64/lithium-codegen-arm64.h"
 #include "src/hydrogen-osr.h"
@@ skipping 1945 matching lines @@
           (small_constant || (base::bits::IsPowerOfTwo32(constant_abs)) ||
            (!can_overflow && (base::bits::IsPowerOfTwo32(constant_abs + 1) ||
                               base::bits::IsPowerOfTwo32(constant_abs - 1))))) {
         LConstantOperand* right = UseConstant(most_const);
         bool need_register =
             base::bits::IsPowerOfTwo32(constant_abs) && !small_constant;
         LOperand* left = need_register ? UseRegister(least_const)
                                        : UseRegisterAtStart(least_const);
         LInstruction* result =
             DefineAsRegister(new(zone()) LMulConstIS(left, right));
-        if ((bailout_on_minus_zero && constant <= 0) || can_overflow) {
+        if ((bailout_on_minus_zero && constant <= 0) ||
+            (can_overflow && constant != 1 &&
+             base::bits::IsPowerOfTwo32(constant_abs))) {
           result = AssignEnvironment(result);
         }
         return result;
       }
     }
 
     // LMulI/S can handle all cases, but it requires that a register is
     // allocated for the second operand.
     LOperand* left = UseRegisterAtStart(least_const);
     LOperand* right = UseRegisterAtStart(most_const);
@@ skipping 775 matching lines @@
     HAllocateBlockContext* instr) {
   LOperand* context = UseFixed(instr->context(), cp);
   LOperand* function = UseRegisterAtStart(instr->function());
   LAllocateBlockContext* result =
       new(zone()) LAllocateBlockContext(context, function);
   return MarkAsCall(DefineFixed(result, cp), instr);
 }
 
 
 } }  // namespace v8::internal