Finishes removing intptr_t from raw object fields.

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 235 matching lines @@
 RawLocalVarDescriptors* LocalScope::GetVarDescriptors(const Function& func) {
   GrowableArray<VarDesc> vars(8);
   // First enter all variables from scopes of outer functions.
   const ContextScope& context_scope =
       ContextScope::Handle(func.context_scope());
   if (!context_scope.IsNull()) {
     ASSERT(func.IsLocalFunction());
     for (int i = 0; i < context_scope.num_variables(); i++) {
       VarDesc desc;
       desc.name = &String::Handle(context_scope.NameAt(i));
-      desc.info.kind =  RawLocalVarDescriptors::kContextVar;
+      desc.info.index_kind = RawLocalVarDescriptors::KindBits::update(
+          RawLocalVarDescriptors::kContextVar, desc.info.index_kind);
       desc.info.scope_id = context_scope.ContextLevelAt(i);
       desc.info.begin_pos = begin_token_pos();
       desc.info.end_pos = end_token_pos();
       ASSERT(desc.info.begin_pos <= desc.info.end_pos);
-      desc.info.index = context_scope.ContextIndexAt(i);
+      desc.info.index_kind = RawLocalVarDescriptors::IndexBits::update(
+          context_scope.ContextIndexAt(i), desc.info.index_kind);
       vars.Add(desc);
     }
   }
   // Now collect all variables from local scopes.
   int16_t scope_id = 0;
   CollectLocalVariables(&vars, &scope_id);
 
   const LocalVarDescriptors& var_desc =
       LocalVarDescriptors::Handle(LocalVarDescriptors::New(vars.length()));
   for (int i = 0; i < vars.length(); i++) {
@@ skipping 16 matching lines @@
                                        int16_t* scope_id) {
   (*scope_id)++;
   if (HasContextLevel() &&
       ((parent() == NULL) ||
       (!parent()->HasContextLevel()) ||
       (parent()->context_level() != context_level()))) {
     // This is the outermost scope with a context level or this scope's
     // context level differs from its parent's level.
     VarDesc desc;
     desc.name = &String::Handle();  // No name.
-    desc.info.kind =  RawLocalVarDescriptors::kContextLevel;
+    desc.info.index_kind = RawLocalVarDescriptors::KindBits::update(
+          RawLocalVarDescriptors::kContextLevel, desc.info.index_kind);
     desc.info.scope_id = *scope_id;
     desc.info.begin_pos = begin_token_pos();
     desc.info.end_pos = end_token_pos();
-    desc.info.index = context_level();
+    desc.info.index_kind = RawLocalVarDescriptors::IndexBits::update(
+        context_level(), desc.info.index_kind);
     vars->Add(desc);
   }
   for (int i = 0; i < this->variables_.length(); i++) {
     LocalVariable* var = variables_[i];
     if ((var->owner() == this) && !var->is_invisible()) {
       if (!IsInternalIdentifier(var->name())) {
         // This is a regular Dart variable, either stack-based or captured.
         VarDesc desc;
         desc.name = &var->name();
         if (var->is_captured()) {
-          desc.info.kind = RawLocalVarDescriptors::kContextVar;
+          desc.info.index_kind = RawLocalVarDescriptors::KindBits::update(
+              RawLocalVarDescriptors::kContextVar, desc.info.index_kind);
           ASSERT(var->owner() != NULL);
           ASSERT(var->owner()->context_level() >= 0);
           desc.info.scope_id = var->owner()->context_level();
         } else {
-          desc.info.kind = RawLocalVarDescriptors::kStackVar;
+          desc.info.index_kind = RawLocalVarDescriptors::KindBits::update(
+              RawLocalVarDescriptors::kStackVar, desc.info.index_kind);
           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();
+        desc.info.index_kind = RawLocalVarDescriptors::IndexBits::update(
+            var->index(), desc.info.index_kind);
         vars->Add(desc);
       } 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.index_kind = RawLocalVarDescriptors::KindBits::update(
+            RawLocalVarDescriptors::kSavedEntryContext, desc.info.index_kind);
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
-        desc.info.index = var->index();
+        desc.info.index_kind = RawLocalVarDescriptors::IndexBits::update(
+            var->index(), desc.info.index_kind);
         vars->Add(desc);
       } 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.index_kind = RawLocalVarDescriptors::KindBits::update(
+            RawLocalVarDescriptors::kSavedCurrentContext, desc.info.index_kind);
         desc.info.scope_id = 0;
         desc.info.begin_pos = 0;
         desc.info.end_pos = 0;
-        desc.info.index = var->index();
+        desc.info.index_kind = RawLocalVarDescriptors::IndexBits::update(
+            var->index(), desc.info.index_kind);
         vars->Add(desc);
       }
     }
   }
   LocalScope* child = this->child();
   while (child != NULL) {
     child->CollectLocalVariables(vars, scope_id);
     child = child->sibling();
   }
 }
@@ skipping 292 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