Fix ScopeInfo::StackSlotIndex to skip over non-locals

src/scopeinfo.cc

 // Copyright 2011 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 <stdlib.h>
 
 #include "src/v8.h"
 
 #include "src/bootstrapper.h"
 #include "src/scopeinfo.h"
@@ skipping 449 matching lines @@
   DCHECK(0 <= var && var < StrongModeFreeVariableCount());
   int info_index = StrongModeFreeVariablePositionEntriesIndex() + var * 2 + 1;
   int32_t value = 0;
   bool ok = get(info_index)->ToInt32(&value);
   USE(ok);
   DCHECK(ok);
   return value;
 }
 
 
-int ScopeInfo::StackSlotIndex(String* name) {
+int ScopeInfo::StackLocalSlotIndex(String* name) {
   DCHECK(name->IsInternalizedString());
   if (length() > 0) {
     int first_slot_index = Smi::cast(get(StackLocalFirstSlotIndex()))->value();
-    int start = StackLocalEntriesIndex();
+    int start = StackLocalEntriesIndex() + first_slot_index;
     int end = StackLocalEntriesIndex() + StackLocalCount();
     for (int i = start; i < end; ++i) {
       if (name == get(i)) {
         return i - start + first_slot_index;
       }
     }
   }
   return -1;
 }
 
@@ skipping 297 matching lines @@
     info->set_mode(i, var->mode());
     DCHECK(var->index() >= 0);
     info->set_index(i, var->index());
   }
   DCHECK(i == info->length());
   return info;
 }
 
 }  // namespace internal
 }  // namespace v8