Use intptr_t more consistently

Author: Azoy

include/swift/AST/ASTDemangler.h

@@ -231,9 +231,9 @@ class ASTBuilder {
 
   Type createParenType(Type base);
 
-  Type createIntegerType(size_t value);
+  Type createIntegerType(intptr_t value);
 
-  Type createNegativeIntegerType(size_t value);
+  Type createNegativeIntegerType(intptr_t value);
 
   BuiltGenericSignature
   createGenericSignature(ArrayRef<BuiltType> params,

include/swift/Demangling/TypeDecoder.h

@@ -1517,11 +1517,11 @@ class TypeDecoder {
     }
 
     case NodeKind::Integer: {
-      return Builder.createIntegerType((size_t)Node->getIndex());
+      return Builder.createIntegerType((intptr_t)Node->getIndex());
     }
 
     case NodeKind::NegativeInteger: {
-      return Builder.createNegativeIntegerType((size_t)Node->getIndex());
+      return Builder.createNegativeIntegerType((intptr_t)Node->getIndex());
     }
 
     // TODO: Handle OpaqueReturnType, when we're in the middle of reconstructing

include/swift/RemoteInspection/TypeRefBuilder.h

@@ -917,12 +917,12 @@ class TypeRefBuilder {
     return nullptr;
   }
 
-  const TypeRef *createIntegerType(size_t value) {
+  const TypeRef *createIntegerType(intptr_t value) {
     // FIXME: implement
     return nullptr;
   }
 
-  const TypeRef *createNegativeIntegerType(size_t value) {
+  const TypeRef *createNegativeIntegerType(intptr_t value) {
     // FIXME: implement
     return nullptr;
   }

lib/AST/ASTDemangler.cpp

@@ -1035,11 +1035,11 @@ Type ASTBuilder::createParenType(Type base) {
   return ParenType::get(Ctx, base);
 }
 
-Type ASTBuilder::createIntegerType(size_t value) {
+Type ASTBuilder::createIntegerType(intptr_t value) {
   return IntegerType::get(std::to_string(value), /*isNegative*/ false, Ctx);
 }
 
-Type ASTBuilder::createNegativeIntegerType(size_t value) {
+Type ASTBuilder::createNegativeIntegerType(intptr_t value) {
   return IntegerType::get(std::to_string(value), /*isNegative*/ true, Ctx);
 }
 

lib/Demangling/NodePrinter.cpp

@@ -3432,7 +3432,7 @@ NodePointer NodePrinter::print(NodePointer Node, unsigned depth,
     Printer << Node->getIndex();
     return nullptr;
   case Node::Kind::NegativeInteger: {
-    auto signedValue = (ssize_t)Node->getIndex();
+    intptr_t signedValue = Node->getIndex();
 
     Printer << signedValue;
     return nullptr;

stdlib/public/runtime/MetadataLookup.cpp

@@ -2442,11 +2442,11 @@ class DecodedMetadataBuilder {
     return BuiltType();
   }
 
-  TypeLookupErrorOr<BuiltType> createIntegerType(size_t value) {
+  TypeLookupErrorOr<BuiltType> createIntegerType(intptr_t value) {
     return BuiltType(value);
   }
 
-  TypeLookupErrorOr<BuiltType> createNegativeIntegerType(size_t value) {
+  TypeLookupErrorOr<BuiltType> createNegativeIntegerType(intptr_t value) {
     return BuiltType(-value);
   }
 };