Reland "Add handling for argument adaptor frames to inlining."

src/compiler/common-operator.cc

 // Copyright 2014 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 "src/compiler/common-operator.h"
 
 #include "src/assembler.h"
 #include "src/base/lazy-instance.h"
 #include "src/compiler/linkage.h"
 #include "src/unique.h"
@@ skipping 188 matching lines @@
 }
 
 
 const Operator* CommonOperatorBuilder::StateValues(int arguments) {
   return new (zone()) Operator1<int>(IrOpcode::kStateValues, Operator::kPure,
                                      arguments, 1, "StateValues", arguments);
 }
 
 
 const Operator* CommonOperatorBuilder::FrameState(
-    BailoutId bailout_id, OutputFrameStateCombine combine) {
+    FrameStateType type, BailoutId bailout_id,
+    OutputFrameStateCombine state_combine, MaybeHandle<JSFunction> jsfunction) {
   return new (zone()) Operator1<FrameStateCallInfo>(
       IrOpcode::kFrameState, Operator::kPure, 4, 1, "FrameState",
-      FrameStateCallInfo(bailout_id, combine));
+      FrameStateCallInfo(type, bailout_id, state_combine, jsfunction));
 }
 
 
 const Operator* CommonOperatorBuilder::Call(const CallDescriptor* descriptor) {
   class CallOperator FINAL : public Operator1<const CallDescriptor*> {
    public:
     // TODO(titzer): Operator still uses int, whereas CallDescriptor uses
     // size_t.
     CallOperator(const CallDescriptor* descriptor, const char* mnemonic)
         : Operator1<const CallDescriptor*>(
@@ skipping 12 matching lines @@
 
 
 const Operator* CommonOperatorBuilder::Projection(size_t index) {
   return new (zone()) Operator1<size_t>(IrOpcode::kProjection, Operator::kPure,
                                         1, 1, "Projection", index);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8