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

src/compiler/instruction-selector.cc

Index: src/compiler/instruction-selector.cc
diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc
index dec46b6af0938013d14e6d7ab555d315e2afd226..6bc41f47dfcabdd1f14bb9b10847eb8d8bf0bb61 100644
--- a/src/compiler/instruction-selector.cc
+++ b/src/compiler/instruction-selector.cc
@@ -1037,14 +1037,16 @@ void InstructionSelector::AddFrameStateInputs(
   DCHECK_EQ(descriptor->stack_count(), stack->InputCount());
 
   OperandGenerator g(this);
-  for (int i = 0; i < descriptor->parameters_count(); i++) {
+  for (int i = 0; i < static_cast<int>(descriptor->parameters_count()); i++) {
     inputs->push_back(UseOrImmediate(&g, parameters->InputAt(i)));
   }
-  inputs->push_back(UseOrImmediate(&g, context));
-  for (int i = 0; i < descriptor->locals_count(); i++) {
+  if (descriptor->HasContext()) {
+    inputs->push_back(UseOrImmediate(&g, context));
+  }
+  for (int i = 0; i < static_cast<int>(descriptor->locals_count()); i++) {
     inputs->push_back(UseOrImmediate(&g, locals->InputAt(i)));
   }
-  for (int i = 0; i < descriptor->stack_count(); i++) {
+  for (int i = 0; i < static_cast<int>(descriptor->stack_count()); i++) {
     inputs->push_back(UseOrImmediate(&g, stack->InputAt(i)));
   }
 }