[flang] Ensure that the integer for Cray pointer is sized correctly

flang/include/flang/Evaluate/target.h

@@ -131,6 +131,9 @@ class TargetCharacteristics {
   IeeeFeatures &ieeeFeatures() { return ieeeFeatures_; }
   const IeeeFeatures &ieeeFeatures() const { return ieeeFeatures_; }
 
+  std::size_t pointerSize() { return pointerSize_; }
+  void set_pointerSize(std::size_t pointerSize) { pointerSize_ = pointerSize; }
+
 private:
   static constexpr int maxKind{common::maxKind};
   std::uint8_t byteSize_[common::TypeCategory_enumSize][maxKind + 1]{};
@@ -156,6 +159,7 @@ class TargetCharacteristics {
       IeeeFeature::Io, IeeeFeature::NaN, IeeeFeature::Rounding,
       IeeeFeature::Sqrt, IeeeFeature::Standard, IeeeFeature::Subnormal,
       IeeeFeature::UnderflowControl};
+  std::size_t pointerSize_{8 /* bytes */};
 };
 
 } // namespace Fortran::evaluate

flang/include/flang/Tools/TargetSetup.h

@@ -94,6 +94,9 @@ namespace Fortran::tools {
   if (targetTriple.isOSWindows())
     targetCharacteristics.set_isOSWindows(true);
 
+  targetCharacteristics.set_pointerSize(
+      targetTriple.getArchPointerBitWidth() / 8);
+
   // TODO: use target machine data layout to set-up the target characteristics
   // type size and alignment info.
 }

flang/lib/Semantics/resolve-names.cpp

@@ -6690,7 +6690,7 @@ void DeclarationVisitor::Post(const parser::BasedPointer &bp) {
   }
   pointer->set(Symbol::Flag::CrayPointer);
   const DeclTypeSpec &pointerType{MakeNumericType(
-      TypeCategory::Integer, context().defaultKinds().subscriptIntegerKind())};
+      TypeCategory::Integer, context().targetCharacteristics().pointerSize())};
   const auto *type{pointer->GetType()};
   if (!type) {
     pointer->SetType(pointerType);