From ac620decb68aad1a2cf6c0c191b56d78981d9aaa Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 24 Oct 2008 08:07:57 +0000 Subject: [PATCH] PR2919: __builtin_types_compatible_p strips CRV qualifiers. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@58079 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/Expr.cpp | 8 +++++++- lib/AST/ExprConstant.cpp | 8 +++++++- test/Sema/PR2919-builtin-types-compat-strips-crv.c | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 test/Sema/PR2919-builtin-types-compat-strips-crv.c diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index 6e62d09474..c20ca25f28 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -717,7 +717,13 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx, case TypesCompatibleExprClass: { const TypesCompatibleExpr *TCE = cast(this); Result.zextOrTrunc(static_cast(Ctx.getTypeSize(getType()))); - Result = Ctx.typesAreCompatible(TCE->getArgType1(), TCE->getArgType2()); + // Per gcc docs "this built-in function ignores top level + // qualifiers". We need to use the canonical version to properly + // be able to strip CRV qualifiers from the type. + QualType T0 = Ctx.getCanonicalType(TCE->getArgType1()); + QualType T1 = Ctx.getCanonicalType(TCE->getArgType2()); + Result = Ctx.typesAreCompatible(T0.getUnqualifiedType(), + T1.getUnqualifiedType()); break; } case CallExprClass: { diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 5bc4170e70..12010646bc 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -205,7 +205,13 @@ public: } bool VisitTypesCompatibleExpr(const TypesCompatibleExpr *E) { Result.zextOrTrunc(getIntTypeSizeInBits(E->getType())); - Result = Info.Ctx.typesAreCompatible(E->getArgType1(), E->getArgType2()); + // Per gcc docs "this built-in function ignores top level + // qualifiers". We need to use the canonical version to properly + // be able to strip CRV qualifiers from the type. + QualType T0 = Info.Ctx.getCanonicalType(E->getArgType1()); + QualType T1 = Info.Ctx.getCanonicalType(E->getArgType2()); + Result = Info.Ctx.typesAreCompatible(T0.getUnqualifiedType(), + T1.getUnqualifiedType()); return true; } bool VisitDeclRefExpr(const DeclRefExpr *E); diff --git a/test/Sema/PR2919-builtin-types-compat-strips-crv.c b/test/Sema/PR2919-builtin-types-compat-strips-crv.c new file mode 100644 index 0000000000..75d0bdcea6 --- /dev/null +++ b/test/Sema/PR2919-builtin-types-compat-strips-crv.c @@ -0,0 +1,5 @@ +typedef struct foo T0; +typedef const struct foo T1; + +int a0[__builtin_types_compatible_p(T0, + const T1) ? 1 : -1]; -- 2.50.1