Remove caller arguments from nested deoptimization environments.

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 90 matching lines @@
     builder.AddReturnAddressAfter(current->function(),
                                   current->deopt_id(),
                                   slot_ix++);
 
     // The values of outgoing arguments can be changed from the inlined call so
     // we must read them from the inner environment.
     for (intptr_t i = inner->fixed_parameter_count() - 1; i >= 0; i--) {
       builder.AddCopy(inner->LocationAt(i), *inner->ValueAt(i), slot_ix++);
     }
 
-    // Set the locals, not including the outgoing arguments.
-    ASSERT(current->Length() >= inner->fixed_parameter_count());
-    for (intptr_t i = current->Length() - inner->fixed_parameter_count() - 1;
+    // Set the locals, note that outgoing arguments are not in the environment.
+    for (intptr_t i = current->Length() - 1;
          i >= current->fixed_parameter_count();
          i--) {
       builder.AddCopy(current->LocationAt(i), *current->ValueAt(i), slot_ix++);
     }
 
     // PC marker and caller FP.
     builder.AddPcMarker(current->function(), slot_ix++);
     builder.AddCallerFp(slot_ix++);
 
     // Iterate on the outer environment.
@@ skipping 775 matching lines @@
     case ABOVE:         return unsigned_left > unsigned_right;
     case ABOVE_EQUAL:   return unsigned_left >= unsigned_right;
     default:
       UNIMPLEMENTED();
       return false;
   }
 }
 
 
 }  // namespace dart