Finishes removing intptr_t from raw object fields.

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 690 matching lines @@
             function_fullname);
   const LocalVarDescriptors& var_descriptors =
       LocalVarDescriptors::Handle(code.var_descriptors());
   intptr_t var_desc_length =
       var_descriptors.IsNull() ? 0 : var_descriptors.Length();
   String& var_name = String::Handle();
   for (intptr_t i = 0; i < var_desc_length; i++) {
     var_name = var_descriptors.GetName(i);
     RawLocalVarDescriptors::VarInfo var_info;
     var_descriptors.GetInfo(i, &var_info);
-    if (var_info.kind == RawLocalVarDescriptors::kSavedEntryContext) {
-      OS::Print("  saved caller's CTX reg offset %" Pd "\n", var_info.index);
-    } else if (var_info.kind == RawLocalVarDescriptors::kSavedCurrentContext) {
-      OS::Print("  saved current CTX reg offset %" Pd "\n", var_info.index);
+    const int8_t kind =
+        RawLocalVarDescriptors::KindBits::decode(var_info.index_kind);
+    if (kind == RawLocalVarDescriptors::kSavedEntryContext) {
+      OS::Print("  saved caller's CTX reg offset %d\n",
+          RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
+    } else if (kind == RawLocalVarDescriptors::kSavedCurrentContext) {
+      OS::Print("  saved current CTX reg offset %d\n",
+          RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
     } else {
-      if (var_info.kind == RawLocalVarDescriptors::kContextLevel) {
-        OS::Print("  context level %" Pd " scope %d",
-                  var_info.index, var_info.scope_id);
-      } else if (var_info.kind == RawLocalVarDescriptors::kStackVar) {
-        OS::Print("  stack var '%s' offset %" Pd "",
-                  var_name.ToCString(), var_info.index);
+      if (kind == RawLocalVarDescriptors::kContextLevel) {
+        OS::Print("  context level %d scope %d",
+            RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind),
+            var_info.scope_id);
+      } else if (kind == RawLocalVarDescriptors::kStackVar) {
+        OS::Print("  stack var '%s' offset %d",
+          var_name.ToCString(),
+          RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
       } else {
-        ASSERT(var_info.kind == RawLocalVarDescriptors::kContextVar);
-        OS::Print("  context var '%s' level %d offset %" Pd "",
-                  var_name.ToCString(), var_info.scope_id, var_info.index);
+        ASSERT(kind == RawLocalVarDescriptors::kContextVar);
+        OS::Print("  context var '%s' level %d offset %d",
+            var_name.ToCString(), var_info.scope_id,
+            RawLocalVarDescriptors::IndexBits::decode(var_info.index_kind));
       }
-      OS::Print(" (valid %" Pd "-%" Pd ")\n",
-                var_info.begin_pos, var_info.end_pos);
+      OS::Print(" (valid %d-%d)\n", var_info.begin_pos, var_info.end_pos);
     }
   }
   OS::Print("}\n");
 
   OS::Print("Exception Handlers for function '%s' {\n", function_fullname);
   const ExceptionHandlers& handlers =
         ExceptionHandlers::Handle(code.exception_handlers());
   OS::Print("%s}\n", handlers.ToCString());
 
   {
@@ skipping 230 matching lines @@
     const Object& result =
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart