Replace intptr_t with TokenDescriptor

runtime/vm/code_descriptors_test.cc

Index: runtime/vm/code_descriptors_test.cc
diff --git a/runtime/vm/code_descriptors_test.cc b/runtime/vm/code_descriptors_test.cc
index 30cedd4b73a91e4c42658cbb97fd93d17c795ac3..b152bf83df4f11718c716df5c29cab8c9457b357 100644
--- a/runtime/vm/code_descriptors_test.cc
+++ b/runtime/vm/code_descriptors_test.cc
@@ -18,7 +18,7 @@
 
 namespace dart {
 
-static const intptr_t kPos = Token::kNoSourcePos;
+static const TokenDescriptor kPos = TokenDescriptor::kNoSource;
 
 
 CODEGEN_TEST_GENERATE(StackmapCodegen, test) {
@@ -269,7 +269,7 @@ TEST_CASE(StackmapGC) {
 }
 
 
-TEST_CASE(DescriptorList_TokenPositions) {
+TEST_CASE(DescriptorList_TokenDescriptors) {
   DescriptorList* descriptors = new DescriptorList(64);
   ASSERT(descriptors != NULL);
   const intptr_t token_positions[] = {
@@ -287,15 +287,15 @@ TEST_CASE(DescriptorList_TokenPositions) {
     33,
     5,
     5,
-    Token::kMinSourcePos,
-    Token::kMaxSourcePos,
+    TokenDescriptor::kMinSourcePos,
+    TokenDescriptor::kMaxSourcePos,
   };
   const intptr_t num_token_positions =
       sizeof(token_positions) / sizeof(token_positions[0]);
 
   for (intptr_t i = 0; i < num_token_positions; i++) {
     descriptors->AddDescriptor(RawPcDescriptors::kRuntimeCall, 0, 0,
-                               token_positions[i], 0);
+                               TokenDescriptor(token_positions[i]), 0);
   }
 
   const PcDescriptors& finalized_descriptors =
@@ -307,17 +307,17 @@ TEST_CASE(DescriptorList_TokenPositions) {
 
   intptr_t i = 0;
   while (it.MoveNext()) {
-    if (token_positions[i] != it.TokenPos()) {
+    if (token_positions[i] != it.TokenPos().value()) {
       OS::Print("[%" Pd "]: Expected: %" Pd " != %" Pd "\n",
-                i, token_positions[i], it.TokenPos());
+                i, token_positions[i], it.TokenPos().value());
     }
-    EXPECT(token_positions[i] == it.TokenPos());
+    EXPECT(token_positions[i] == it.TokenPos().value());
     i++;
   }
 }
 
 
-TEST_CASE(CodeSourceMap_TokenPositions) {
+TEST_CASE(CodeSourceMap_TokenDescriptors) {
   const intptr_t token_positions[] = {
     kMinInt32,
     5,
@@ -333,8 +333,8 @@ TEST_CASE(CodeSourceMap_TokenPositions) {
     33,
     5,
     5,
-    Token::kMinSourcePos,
-    Token::kMaxSourcePos,
+    TokenDescriptor::kMinSourcePos,
+    TokenDescriptor::kMaxSourcePos,
   };
   const intptr_t num_token_positions =
       sizeof(token_positions) / sizeof(token_positions[0]);
@@ -343,7 +343,7 @@ TEST_CASE(CodeSourceMap_TokenPositions) {
   ASSERT(builder != NULL);
 
   for (intptr_t i = 0; i < num_token_positions; i++) {
-    builder->AddEntry(i, token_positions[i]);
+    builder->AddEntry(i, TokenDescriptor(token_positions[i]));
   }
 
   const CodeSourceMap& code_Source_map =
@@ -355,11 +355,11 @@ TEST_CASE(CodeSourceMap_TokenPositions) {
   uintptr_t i = 0;
   while (it.MoveNext()) {
     EXPECT(it.PcOffset() == i);
-    if (token_positions[i] != it.TokenPos()) {
+    if (token_positions[i] != it.TokenPos().value()) {
       OS::Print("[%" Pd "]: Expected: %" Pd " != %" Pd "\n",
-                i, token_positions[i], it.TokenPos());
+                i, token_positions[i], it.TokenPos().value());
     }
-    EXPECT(token_positions[i] == it.TokenPos());
+    EXPECT(token_positions[i] == it.TokenPos().value());
     i++;
   }
 }