Fix ScopeInfo::StackSlotIndex to skip over non-locals

src/accessors.cc

 // Copyright 2012 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/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/contexts.h"
 #include "src/deoptimizer.h"
@@ skipping 1170 matching lines @@
       // The function in question was inlined.  Inlined functions have the
       // correct number of arguments and no allocated arguments object, so
       // we can construct a fresh one by interpreting the function's
       // deoptimization input data.
       return ArgumentsForInlinedFunction(frame, function, function_index);
     }
 
     if (!frame->is_optimized()) {
       // If there is an arguments variable in the stack, we return that.
       Handle<ScopeInfo> scope_info(function->shared()->scope_info());
-      int index = scope_info->StackSlotIndex(
-          isolate->heap()->arguments_string());
+      int index =
+          scope_info->StackLocalSlotIndex(isolate->heap()->arguments_string());
       if (index >= 0) {
         Handle<Object> arguments(frame->GetExpression(index), isolate);
         if (!arguments->IsArgumentsMarker()) return arguments;
       }
     }
 
     // If there is no arguments variable in the stack or we have an
     // optimized frame, we find the frame that holds the actual arguments
     // passed to the function.
     it.AdvanceToArgumentsFrame();
@@ skipping 287 matching lines @@
   Handle<Object> getter = v8::FromCData(isolate, &ModuleGetExport);
   Handle<Object> setter = v8::FromCData(isolate, &ModuleSetExport);
   info->set_getter(*getter);
   if (!(attributes & ReadOnly)) info->set_setter(*setter);
   return info;
 }
 
 
 }  // namespace internal
 }  // namespace v8