Use correct arguments adaptation environment when inlining function containing arguments.

src/hydrogen.cc

 // Copyright 2012 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 5731 matching lines @@
     return true;
   } else {
     // We are inside inlined function and we know exactly what is inside
     // arguments object.
     HValue* context = environment()->LookupContext();
 
     HValue* wrapped_receiver =
         AddInstruction(new(zone()) HWrapReceiver(receiver, function));
     PushAndAdd(new(zone()) HPushArgument(wrapped_receiver));
 
-    int parameter_count = environment()->parameter_count();
-    for (int i = 1; i < environment()->parameter_count(); i++) {
-      PushAndAdd(new(zone()) HPushArgument(environment()->Lookup(i)));
-    }
+    HEnvironment* arguments_env = environment()->arguments_environment();
 
-    if (environment()->outer()->frame_type() == ARGUMENTS_ADAPTOR) {
-      HEnvironment* adaptor = environment()->outer();
-      parameter_count = adaptor->parameter_count();
-
-      for (int i = environment()->parameter_count();
-           i < adaptor->parameter_count();
-           i++) {
-        PushAndAdd(new(zone()) HPushArgument(adaptor->Lookup(i)));
-      }
+    int parameter_count = arguments_env->parameter_count();
+    for (int i = 1; i < arguments_env->parameter_count(); i++) {
+      PushAndAdd(new(zone()) HPushArgument(arguments_env->Lookup(i)));
     }
 
     HInvokeFunction* call = new(zone()) HInvokeFunction(
         context,
         function,
         parameter_count);
     Drop(parameter_count);
     call->set_position(expr->position());
     ast_context()->ReturnInstruction(call, expr->id());
     return true;
@@ skipping 2389 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify(false);  // No full verify.
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal