RTBuilder.h tweaks

Author: klausler

flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h

@@ -402,47 +402,62 @@ constexpr TypeBuilderFunc getModel<bool &>() {
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned short>() {
-  return getModel<short>();
+  return [](mlir::MLIRContext *context) -> mlir::Type {
+    return mlir::IntegerType::get(
+        context, 8 * sizeof(unsigned short),
+        mlir::IntegerType::SignednessSemantics::Unsigned);
+  };
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned char *>() {
-  return getModel<char *>();
+  return [](mlir::MLIRContext *context) -> mlir::Type {
+    return fir::ReferenceType::get(mlir::IntegerType::get(context, 8));
+  };
 }
 template <>
 constexpr TypeBuilderFunc getModel<const unsigned char *>() {
-  return getModel<char *>();
+  return getModel<unsigned char *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned short *>() {
-  return getModel<short *>();
+  return [](mlir::MLIRContext *context) -> mlir::Type {
+    return fir::ReferenceType::get(
+        mlir::IntegerType::get(context, 8 * sizeof(unsigned short)));
+  };
 }
 template <>
 constexpr TypeBuilderFunc getModel<const unsigned short *>() {
-  return getModel<short *>();
+  return getModel<unsigned short *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned *>() {
   return getModel<int *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<const unsigned *>() {
-  return getModel<int *>();
+  return getModel<unsigned *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned long *>() {
-  return getModel<long *>();
+  return [](mlir::MLIRContext *context) -> mlir::Type {
+    return fir::ReferenceType::get(
+        mlir::IntegerType::get(context, 8 * sizeof(unsigned long)));
+  };
 }
 template <>
 constexpr TypeBuilderFunc getModel<const unsigned long *>() {
-  return getModel<long *>();
+  return getModel<unsigned long *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<unsigned long long *>() {
-  return getModel<long long *>();
+  return [](mlir::MLIRContext *context) -> mlir::Type {
+    return fir::ReferenceType::get(
+        mlir::IntegerType::get(context, 8 * sizeof(unsigned long long)));
+  };
 }
 template <>
 constexpr TypeBuilderFunc getModel<const unsigned long long *>() {
-  return getModel<long long *>();
+  return getModel<unsigned long long *>();
 }
 template <>
 constexpr TypeBuilderFunc getModel<Fortran::common::uint128_t>() {
@@ -461,7 +476,7 @@ constexpr TypeBuilderFunc getModel<Fortran::common::uint128_t *>() {
 }
 template <>
 constexpr TypeBuilderFunc getModel<const Fortran::common::uint128_t *>() {
-  return getModel<Fortran::common::int128_t *>();
+  return getModel<Fortran::common::uint128_t *>();
 }
 
 // getModel<std::complex<T>> are not implemented on purpose.

flang/lib/Evaluate/intrinsics.cpp

@@ -141,7 +141,6 @@ static constexpr TypePattern SubscriptInt{IntType, KindCode::subscript};
 
 // Match any kind of some intrinsic or derived types
 static constexpr TypePattern AnyInt{IntType, KindCode::any};
-static constexpr TypePattern AnyUnsigned{UnsignedType, KindCode::any};
 static constexpr TypePattern AnyIntOrUnsigned{IntOrUnsignedType, KindCode::any};
 static constexpr TypePattern AnyReal{RealType, KindCode::any};
 static constexpr TypePattern AnyIntOrReal{IntOrRealType, KindCode::any};
@@ -193,8 +192,6 @@ static constexpr TypePattern SameType{AnyType, KindCode::same};
 static constexpr TypePattern OperandReal{RealType, KindCode::operand};
 static constexpr TypePattern OperandInt{IntType, KindCode::operand};
 static constexpr TypePattern OperandUnsigned{UnsignedType, KindCode::operand};
-static constexpr TypePattern OperandIntOrUnsigned{
-    IntOrUnsignedType, KindCode::operand};
 static constexpr TypePattern OperandIntOrReal{IntOrRealType, KindCode::operand};
 static constexpr TypePattern OperandIntUnsignedOrReal{
     IntUnsignedOrRealType, KindCode::operand};

flang/lib/Semantics/resolve-names.cpp

@@ -7597,6 +7597,7 @@ const DeclTypeSpec &ConstructVisitor::ToDeclTypeSpec(
   switch (type.category()) {
     SWITCH_COVERS_ALL_CASES
   case common::TypeCategory::Integer:
+  case common::TypeCategory::Unsigned:
   case common::TypeCategory::Real:
   case common::TypeCategory::Complex:
     return context().MakeNumericType(type.category(), type.kind());