- Ensure that all names in local scopes are symbols.

runtime/vm/scopes.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/scopes.h"
 
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
@@ skipping 63 matching lines @@
   if (label->owner() == NULL) {
     // Labels must be added to their owner scope first. Subsequent calls
     // to 'add' treat the label as an alias.
     label->set_owner(this);
   }
   return true;
 }
 
 
 NameReference* LocalScope::FindReference(const String& name) const {
+  ASSERT(name.IsSymbol());
   intptr_t num_references = referenced_.length();
   for (intptr_t i = 0; i < num_references; i++) {
-    if (name.Equals(referenced_[i]->name())) {
+    if (name.raw() == referenced_[i]->name().raw()) {
       return referenced_[i];
     }
   }
   return NULL;
 }
 
 
 void LocalScope::AddReferencedName(intptr_t token_pos,
                                    const String& name) {
   if (LocalLookupVariable(name) != NULL) {
@@ skipping 196 matching lines @@
           ASSERT(var->owner()->context_level() >= 0);
           desc.info.scope_id = var->owner()->context_level();
         } else {
           desc.info.kind = RawLocalVarDescriptors::kStackVar;
           desc.info.scope_id = *scope_id;
         }
         desc.info.begin_pos = var->token_pos();
         desc.info.end_pos = var->owner()->end_token_pos();
         desc.info.index = var->index();
         vars->Add(desc);
-      } else if (var->name().Equals(Symbols::SavedEntryContextVar())) {
+      } else if (var->name().raw() == Symbols::SavedEntryContextVar().raw()) {
         // This is the local variable in which the function saves the
         // caller's chain of closure contexts (caller's CTX register).
         VarDesc desc;
         desc.name = &var->name();
         desc.info.kind = RawLocalVarDescriptors::kSavedEntryContext;
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
         desc.info.index = var->index();
         vars->Add(desc);
-      } else if (var->name().Equals(Symbols::SavedCurrentContextVar())) {
+      } else if (var->name().raw() == Symbols::SavedCurrentContextVar().raw()) {
         // This is the local variable in which the function saves its
         // own context before calling a closure function.
         VarDesc desc;
         desc.name = &var->name();
         desc.info.kind = RawLocalVarDescriptors::kSavedCurrentContext;
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
         desc.info.index = var->index();
         vars->Add(desc);
       }
     }
   }
   LocalScope* child = this->child();
   while (child != NULL) {
     child->CollectLocalVariables(vars, scope_id);
     child = child->sibling();
   }
 }
 
 
 SourceLabel* LocalScope::LocalLookupLabel(const String& name) const {
+  ASSERT(name.IsSymbol());
   for (intptr_t i = 0; i < labels_.length(); i++) {
     SourceLabel* label = labels_[i];
-    if (label->name().Equals(name)) {
+    if (label->name().raw() == name.raw()) {
       return label;
     }
   }
   return NULL;
 }
 
 
 LocalVariable* LocalScope::LocalLookupVariable(const String& name) const {
   ASSERT(name.IsSymbol());
   for (intptr_t i = 0; i < variables_.length(); i++) {
@@ skipping 275 matching lines @@
     return fixed_parameter_count - (index() - kParamEndSlotFromFp);
   } else {
     // Shift negative indexes so that the lowest one is 0 (they are still
     // non-positive).
     return fixed_parameter_count - (index() - kFirstLocalSlotFromFp);
   }
 }
 
 
 }  // namespace dart