A64: Synchronize with r15922.

src/a64/lithium-codegen-a64.h

 // Copyright 2013 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 109 matching lines @@
   Operand ToOperand(LOperand* op);
   Operand ToOperand32(LOperand* op);
   MemOperand ToMemOperand(LOperand* op) const;
   Handle<Object> ToHandle(LConstantOperand* op) const;
 
   // TODO(jbramley): Examine these helpers and check that they make sense.
   // IsInteger32Constant returns true for smi constants, for example.
   bool IsInteger32Constant(LConstantOperand* op) const;
   bool IsSmi(LConstantOperand* op) const;
 
-  int ToInteger32(LConstantOperand* op) const;
+  int32_t ToInteger32(LConstantOperand* op) const;
   Smi* ToSmi(LConstantOperand* op) const;
   double ToDouble(LConstantOperand* op) const;
   DoubleRegister ToDoubleRegister(LOperand* op) const;
 
   // Declare methods that deal with the individual node types.
 #define DECLARE_DO(type) void Do##type(L##type* node);
   LITHIUM_CONCRETE_INSTRUCTION_LIST(DECLARE_DO)
 #undef DECLARE_DO
 
  private:
@@ skipping 98 matching lines @@
                                        LEnvironment* env);
 
   void RegisterDependentCodeForEmbeddedMaps(Handle<Code> code);
   int DefineDeoptimizationLiteral(Handle<Object> literal);
   void PopulateDeoptimizationData(Handle<Code> code);
   void PopulateDeoptimizationLiteralsWithInlinedFunctions();
 
   void Deoptimize(LEnvironment* environment);
   void Deoptimize(LEnvironment* environment,
                   Deoptimizer::BailoutType bailout_type);
-  void SoftDeoptimize(LEnvironment* environment);
   void DeoptimizeIf(Condition cc, LEnvironment* environment);
   void DeoptimizeIfZero(Register rt, LEnvironment* environment);
   void DeoptimizeIfNegative(Register rt, LEnvironment* environment);
   void DeoptimizeIfSmi(Register rt, LEnvironment* environment);
   void DeoptimizeIfNotSmi(Register rt, LEnvironment* environment);
   void DeoptimizeIfRoot(Register rt,
                         Heap::RootListIndex index,
                         LEnvironment* environment);
   void DeoptimizeIfNotRoot(Register rt,
                            Heap::RootListIndex index,
                            LEnvironment* environment);
+  void ApplyCheckIf(Condition cc, LBoundsCheck* check);
 
   MemOperand PrepareKeyedExternalArrayOperand(Register key,
                                               Register base,
                                               Register scratch,
                                               bool key_is_smi,
                                               bool key_is_constant,
                                               int constant_key,
                                               int element_size_shift,
                                               int additional_index);
   void CalcKeyedArrayBaseRegister(Register base,
@@ skipping 209 matching lines @@
 
  protected:
   MacroAssembler* masm() const { return codegen_->masm(); }
 
   LCodeGen* codegen_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_A64_LITHIUM_CODEGEN_A64_H_