Revert r10076 due to arm build failures.

src/scopes.cc

Index: src/scopes.cc
diff --git a/src/scopes.cc b/src/scopes.cc
index e05ca172518cdf8cdc7abf4eb9ef697673bd1c9e..29fd5ebad6db1a02b38efa6d81b5446ddecd35c0 100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -661,14 +661,14 @@ Handle<ScopeInfo> Scope::GetScopeInfo() {
 void Scope::GetNestedScopeChain(
     List<Handle<ScopeInfo> >* chain,
     int position) {
-  if (!is_eval_scope()) chain->Add(Handle<ScopeInfo>(GetScopeInfo()));
+  chain->Add(Handle<ScopeInfo>(GetScopeInfo()));
 
   for (int i = 0; i < inner_scopes_.length(); i++) {
     Scope* scope = inner_scopes_[i];
     int beg_pos = scope->start_position();
     int end_pos = scope->end_position();
     ASSERT(beg_pos >= 0 && end_pos >= 0);
-    if (beg_pos <= position && position < end_pos) {
+    if (beg_pos <= position && position <= end_pos) {
       scope->GetNestedScopeChain(chain, position);
       return;
     }