Finishes removing intptr_t from raw object fields.

runtime/vm/debugger.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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 429 matching lines @@
     }
     ASSERT(!pc_desc_.IsNull());
     intptr_t innermost_begin_pos = 0;
     intptr_t activation_token_pos = TokenPos();
     ASSERT(activation_token_pos >= 0);
     GetVarDescriptors();
     intptr_t var_desc_len = var_descriptors_.Length();
     for (intptr_t cur_idx = 0; cur_idx < var_desc_len; cur_idx++) {
       RawLocalVarDescriptors::VarInfo var_info;
       var_descriptors_.GetInfo(cur_idx, &var_info);
-      if ((var_info.kind == RawLocalVarDescriptors::kContextLevel) &&
+      const int8_t kind =
+          RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);

[Ivan Posva, 2014/07/23 12:23:26]

Wouldn't this read better if it was

const int8_t kind = var_info.kind();

where

int8_t RawLocalVarDescriptors::VarInfo::kind() {
  return RawLocalVarDescriptors::KindBits::decode(index_kind);
}

or even better if the different kinds were an enum and then you can return the
enum instead of int8_t?

That of course means that VarInfo needs to be a class instead of a struct.

[zra, 2014/08/20 22:13:56]

Done and also added set_kind() and set_index()

+      if ((kind == RawLocalVarDescriptors::kContextLevel) &&
           (var_info.begin_pos <= activation_token_pos) &&
           (activation_token_pos < var_info.end_pos)) {
         // This var_descriptors_ entry is a context scope which is in scope
         // of the current token position. Now check whether it is shadowing
         // the previous context scope.
         if (innermost_begin_pos < var_info.begin_pos) {
           innermost_begin_pos = var_info.begin_pos;
-          context_level_ = var_info.index;
+          context_level_ =
+              RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind);

[Ivan Posva, 2014/07/23 12:23:27]

ditto

[zra, 2014/08/20 22:13:56]

Done.

         }
       }
     }
     ASSERT(context_level_ >= 0);
   }
   return context_level_;
 }
 
 
 RawContext* ActivationFrame::GetSavedEntryContext() {
   // Attempt to find a saved context.
   GetVarDescriptors();
   intptr_t var_desc_len = var_descriptors_.Length();
   for (intptr_t i = 0; i < var_desc_len; i++) {
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors_.GetInfo(i, &var_info);
-    if (var_info.kind == RawLocalVarDescriptors::kSavedEntryContext) {
+    const int8_t kind =
+        RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);
+    if (kind == RawLocalVarDescriptors::kSavedEntryContext) {
       if (FLAG_trace_debugger_stacktrace) {
-        OS::PrintErr("\tFound saved entry ctx at index %" Pd "\n",
-                     var_info.index);
+        OS::PrintErr("\tFound saved entry ctx at index %d\n",
+            RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
       }
-      return GetLocalContextVar(var_info.index);
+      return GetLocalContextVar(
+          RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
     }
   }
 
   // No saved context.  Return the current context.
   return ctx_.raw();
 }
 
 
 // Get the saved context if the callee of this activation frame is a
 // closure function.
 RawContext* ActivationFrame::GetSavedCurrentContext() {
   GetVarDescriptors();
   intptr_t var_desc_len = var_descriptors_.Length();
   for (intptr_t i = 0; i < var_desc_len; i++) {
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors_.GetInfo(i, &var_info);
-    if (var_info.kind == RawLocalVarDescriptors::kSavedCurrentContext) {
+    const int8_t kind =
+        RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);
+    if (kind == RawLocalVarDescriptors::kSavedCurrentContext) {
       if (FLAG_trace_debugger_stacktrace) {
-        OS::PrintErr("\tFound saved current ctx at index %" Pd "\n",
-                     var_info.index);
+        OS::PrintErr("\tFound saved current ctx at index %d\n",
+            RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
       }
-      return GetLocalContextVar(var_info.index);
+      return GetLocalContextVar(
+          RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
     }
   }
   UNREACHABLE();
   return Context::null();
 }
 
 
 const char* DebuggerEvent::EventTypeToCString(EventType type) {
   switch (type) {
     case kBreakpointReached:
@@ skipping 83 matching lines @@
     vars_initialized_ = true;
     return;
   }
 
   GrowableArray<String*> var_names(8);
   intptr_t var_desc_len = var_descriptors_.Length();
   for (intptr_t cur_idx = 0; cur_idx < var_desc_len; cur_idx++) {
     ASSERT(var_names.length() == desc_indices_.length());
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors_.GetInfo(cur_idx, &var_info);
-    if ((var_info.kind != RawLocalVarDescriptors::kStackVar) &&
-        (var_info.kind != RawLocalVarDescriptors::kContextVar)) {
+    const int8_t kind =
+        RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);
+    if ((kind != RawLocalVarDescriptors::kStackVar) &&
+        (kind != RawLocalVarDescriptors::kContextVar)) {
       continue;
     }
     if ((var_info.begin_pos <= activation_token_pos) &&
         (activation_token_pos <= var_info.end_pos)) {
-      if ((var_info.kind == RawLocalVarDescriptors::kContextVar) &&
+      if ((kind == RawLocalVarDescriptors::kContextVar) &&
           (ContextLevel() < var_info.scope_id)) {
         // The variable is textually in scope but the context level
         // at the activation frame's PC is lower than the context
         // level of the variable. The context containing the variable
         // has already been removed from the chain. This can happen when we
         // break at a return statement, since the contexts get discarded
         // before the debugger gets called.
         continue;
       }
       // The current variable is textually in scope. Now check whether
@@ skipping 130 matching lines @@
   intptr_t desc_index = desc_indices_[i];
   ASSERT(name != NULL);
   *name ^= var_descriptors_.GetName(desc_index);
   RawLocalVarDescriptors::VarInfo var_info;
   var_descriptors_.GetInfo(desc_index, &var_info);
   ASSERT(token_pos != NULL);
   *token_pos = var_info.begin_pos;
   ASSERT(end_pos != NULL);
   *end_pos = var_info.end_pos;
   ASSERT(value != NULL);
-  if (var_info.kind == RawLocalVarDescriptors::kStackVar) {
-    *value = GetLocalInstanceVar(var_info.index);
+  const int8_t kind =
+    RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);
+  if (kind == RawLocalVarDescriptors::kStackVar) {
+    *value = GetLocalInstanceVar(
+        RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
   } else {
-    ASSERT(var_info.kind == RawLocalVarDescriptors::kContextVar);
+    ASSERT(kind == RawLocalVarDescriptors::kContextVar);
     if (ctx_.IsNull()) {
       // The context has been removed by the optimizing compiler.
       //
       // TODO(turnidge): This may be erroneous.  Revisit.
       *value = Symbols::OptimizedOut().raw();
       return;
     }
 
     // The context level at the PC/token index of this activation frame.
     intptr_t frame_ctx_level = ContextLevel();
 
     // The context level of the variable.
     intptr_t var_ctx_level = var_info.scope_id;
     intptr_t level_diff = frame_ctx_level - var_ctx_level;
-    intptr_t ctx_slot = var_info.index;
+    intptr_t ctx_slot =
+        RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind);
     if (level_diff == 0) {
       if ((ctx_slot < 0) ||
           (ctx_slot >= ctx_.num_variables())) {
         PrintContextMismatchError(*name, ctx_slot,
                                   frame_ctx_level, var_ctx_level);
       }
       ASSERT((ctx_slot >= 0) && (ctx_slot < ctx_.num_variables()));
       *value = ctx_.At(ctx_slot);
     } else {
       ASSERT(level_diff > 0);
@@ skipping 1792 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart