https://github.com/michele-scandale updated
https://github.com/llvm/llvm-project/pull/136038
>From 359e31eece5b7ddf4a62074a67947c31f4538ed1 Mon Sep 17 00:00:00 2001
From: Michele Scandale <michele.scand...@gmail.com>
Date: Mon, 21 Apr 2025 12:47:10 -0700
Subject: [PATCH] [clang] Rework `hasBooleanRepresentation`.
This is a follow-up of 13aac46332f607a38067b5ddd466071683b8c255.
This commit adjusts the implementation of `hasBooleanRepresentation` to
somewhat aligned to `hasIntegerRepresentation`.
In particular vector of booleans should be handled in
`hasBooleanRepresentation`, while `_Atomic(bool)` should not.
---
clang/include/clang/AST/Type.h | 5 +++--
clang/lib/AST/Type.cpp | 19 +++++++++----------
clang/lib/CodeGen/CGExpr.cpp | 20 +++++++++++++-------
3 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index 1ecd64539e2de..c3c2fe6249526 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -2773,8 +2773,9 @@ class alignas(TypeAlignment) Type : public
ExtQualsTypeCommonBase {
/// of some sort, e.g., it is a floating-point type or a vector thereof.
bool hasFloatingRepresentation() const;
- /// Determine whether this type has a boolean representation
- /// of some sort.
+ /// Determine whether this type has a boolean representation -- i.e., it is a
+ /// boolean type, an enum type whose underlying type is a boolean type, or a
+ /// vector of booleans.
bool hasBooleanRepresentation() const;
// Type Checking Functions: Check to see if this type is structurally the
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 42e94d66d1a13..8a8549e46aa0c 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -2344,16 +2344,15 @@ bool Type::isArithmeticType() const {
}
bool Type::hasBooleanRepresentation() const {
- if (isBooleanType())
- return true;
-
- if (const EnumType *ET = getAs<EnumType>())
- return ET->getDecl()->getIntegerType()->isBooleanType();
-
- if (const AtomicType *AT = getAs<AtomicType>())
- return AT->getValueType()->hasBooleanRepresentation();
-
- return false;
+ if (const auto *VT = dyn_cast<VectorType>(CanonicalType))
+ return VT->getElementType()->isBooleanType();
+ if (const auto *ET = dyn_cast<EnumType>(CanonicalType)) {
+ return ET->getDecl()->isComplete() &&
+ ET->getDecl()->getIntegerType()->isBooleanType();
+ }
+ if (const auto *IT = dyn_cast<BitIntType>(CanonicalType))
+ return IT->getNumBits() == 1;
+ return isBooleanType();
}
Type::ScalarTypeKind Type::getScalarTypeKind() const {
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 1efc626a8f5a6..b9d8266576de4 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1920,7 +1920,7 @@ static bool getRangeForType(CodeGenFunction &CGF,
QualType Ty,
llvm::MDNode *CodeGenFunction::getRangeForLoadFromType(QualType Ty) {
llvm::APInt Min, End;
if (!getRangeForType(*this, Ty, Min, End, CGM.getCodeGenOpts().StrictEnums,
- Ty->hasBooleanRepresentation()))
+ Ty->hasBooleanRepresentation() && !Ty->isVectorType()))
return nullptr;
llvm::MDBuilder MDHelper(getLLVMContext());
@@ -1948,7 +1948,7 @@ bool CodeGenFunction::EmitScalarRangeCheck(llvm::Value
*Value, QualType Ty,
if (!HasBoolCheck && !HasEnumCheck)
return false;
- bool IsBool = Ty->hasBooleanRepresentation() ||
+ bool IsBool = (Ty->hasBooleanRepresentation() && !Ty->isVectorType()) ||
NSAPI(CGM.getContext()).isObjCBOOLType(Ty);
bool NeedsBoolCheck = HasBoolCheck && IsBool;
bool NeedsEnumCheck = HasEnumCheck && Ty->getAs<EnumType>();
@@ -2068,11 +2068,8 @@ llvm::Value *CodeGenFunction::EmitLoadOfScalar(Address
Addr, bool Volatile,
/// by ConvertType) to its load/store type (as returned by
/// convertTypeForLoadStore).
llvm::Value *CodeGenFunction::EmitToMemory(llvm::Value *Value, QualType Ty) {
- if (Ty->hasBooleanRepresentation() || Ty->isBitIntType()) {
- llvm::Type *StoreTy = convertTypeForLoadStore(Ty, Value->getType());
- bool Signed = Ty->isSignedIntegerOrEnumerationType();
- return Builder.CreateIntCast(Value, StoreTy, Signed, "storedv");
- }
+ if (auto *AtomicTy = Ty->getAs<AtomicType>())
+ Ty = AtomicTy->getValueType();
if (Ty->isExtVectorBoolType()) {
llvm::Type *StoreTy = convertTypeForLoadStore(Ty, Value->getType());
@@ -2088,6 +2085,12 @@ llvm::Value *CodeGenFunction::EmitToMemory(llvm::Value
*Value, QualType Ty) {
Value = Builder.CreateBitCast(Value, StoreTy);
}
+ if (Ty->hasBooleanRepresentation() || Ty->isBitIntType()) {
+ llvm::Type *StoreTy = convertTypeForLoadStore(Ty, Value->getType());
+ bool Signed = Ty->isSignedIntegerOrEnumerationType();
+ return Builder.CreateIntCast(Value, StoreTy, Signed, "storedv");
+ }
+
return Value;
}
@@ -2095,6 +2098,9 @@ llvm::Value *CodeGenFunction::EmitToMemory(llvm::Value
*Value, QualType Ty) {
/// by convertTypeForLoadStore) to its primary IR type (as returned
/// by ConvertType).
llvm::Value *CodeGenFunction::EmitFromMemory(llvm::Value *Value, QualType Ty) {
+ if (auto *AtomicTy = Ty->getAs<AtomicType>())
+ Ty = AtomicTy->getValueType();
+
if (Ty->isPackedVectorBoolType(getContext())) {
const auto *RawIntTy = Value->getType();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
