[clang] Reject incomplete types in __is_layout_compatible()#87869
Merged
[clang] Reject incomplete types in __is_layout_compatible()#87869
__is_layout_compatible()#87869Conversation
This is a follow-up to llvm#81506. As discussed in llvm#87737, we're rejecting incomplete types, save for exceptions listed in the C++ standard (`void` and arrays of unknown bound). Note that arrays of unknown bound of incomplete types are accepted. Since we're happy with the current behavior of this intrinsic for flexible array members (llvm#87737 (comment)), I added a couple of tests for that as well.
Member
|
@llvm/pr-subscribers-clang Author: Vlad Serebrennikov (Endilll) ChangesThis is a follow-up to #81506. As discussed in #87737, we're rejecting incomplete types, save for exceptions listed in the C++ standard ( Since we're happy with the current behavior of this intrinsic for flexible array members (#87737 (comment)), I added a couple of tests for that as well. Full diff: https://github.com/llvm/llvm-project/pull/87869.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index db84f181012268..b5761ade2d445e 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -6026,6 +6026,11 @@ static bool EvaluateBinaryTypeTrait(Sema &Self, TypeTrait BTT, QualType LhsT,
return false;
}
case BTT_IsLayoutCompatible: {
+ if (!LhsT->isVoidType() && !LhsT->isIncompleteArrayType())
+ Self.RequireCompleteType(KeyLoc, LhsT, diag::err_incomplete_type);
+ if (!RhsT->isVoidType() && !RhsT->isIncompleteArrayType())
+ Self.RequireCompleteType(KeyLoc, RhsT, diag::err_incomplete_type);
+
if (LhsT->isVariableArrayType() || RhsT->isVariableArrayType())
Self.Diag(KeyLoc, diag::err_vla_unsupported)
<< 1 << tok::kw___is_layout_compatible;
diff --git a/clang/test/SemaCXX/type-traits.cpp b/clang/test/SemaCXX/type-traits.cpp
index e99ad11666e54c..e29763714341e7 100644
--- a/clang/test/SemaCXX/type-traits.cpp
+++ b/clang/test/SemaCXX/type-traits.cpp
@@ -1622,7 +1622,7 @@ enum class EnumClassLayout {};
enum EnumForward : int;
enum class EnumClassForward;
-struct CStructIncomplete;
+struct CStructIncomplete; // #CStructIncomplete
struct CStructNested {
int a;
@@ -1719,6 +1719,20 @@ struct StructWithAnonUnion3 {
} u;
};
+struct CStructWithArrayAtTheEnd {
+ int a;
+ int b[4];
+};
+
+struct CStructWithFMA {
+ int c;
+ int d[];
+};
+
+struct CStructWithFMA2 {
+ int e;
+ int f[];
+};
void is_layout_compatible(int n)
{
@@ -1800,15 +1814,28 @@ void is_layout_compatible(int n)
static_assert(__is_layout_compatible(EnumLayout, EnumClassLayout));
static_assert(__is_layout_compatible(EnumForward, EnumForward));
static_assert(__is_layout_compatible(EnumForward, EnumClassForward));
- // Layout compatibility for enums might be relaxed in the future. See https://github.com/cplusplus/CWG/issues/39#issuecomment-1184791364
+ static_assert(__is_layout_compatible(CStructIncomplete, CStructIncomplete));
+ // expected-error@-1 {{incomplete type 'CStructIncomplete' where a complete type is required}}
+ // expected-note@#CStructIncomplete {{forward declaration of 'CStructIncomplete'}}
+ // expected-error@-3 {{incomplete type 'CStructIncomplete' where a complete type is required}}
+ // expected-note@#CStructIncomplete {{forward declaration of 'CStructIncomplete'}}
+ static_assert(!__is_layout_compatible(CStruct, CStructIncomplete));
+ // expected-error@-1 {{incomplete type 'CStructIncomplete' where a complete type is required}}
+ // expected-note@#CStructIncomplete {{forward declaration of 'CStructIncomplete'}}
+ static_assert(__is_layout_compatible(CStructIncomplete[2], CStructIncomplete[2]));
+ // expected-error@-1 {{incomplete type 'CStructIncomplete[2]' where a complete type is required}}
+ // expected-note@#CStructIncomplete {{forward declaration of 'CStructIncomplete'}}
+ // expected-error@-3 {{incomplete type 'CStructIncomplete[2]' where a complete type is required}}
+ // expected-note@#CStructIncomplete {{forward declaration of 'CStructIncomplete'}}
+ static_assert(__is_layout_compatible(CStructIncomplete[], CStructIncomplete[]));
+ static_assert(!__is_layout_compatible(CStructWithArrayAtTheEnd, CStructWithFMA));
+ static_assert(__is_layout_compatible(CStructWithFMA, CStructWithFMA));
+ static_assert(__is_layout_compatible(CStructWithFMA, CStructWithFMA2));
+ // Layout compatibility rules for enums might be relaxed in the future. See https://github.com/cplusplus/CWG/issues/39#issuecomment-1184791364
static_assert(!__is_layout_compatible(EnumLayout, int));
static_assert(!__is_layout_compatible(EnumClassLayout, int));
static_assert(!__is_layout_compatible(EnumForward, int));
static_assert(!__is_layout_compatible(EnumClassForward, int));
- // FIXME: the following should be rejected (array of unknown bound and void are the only allowed incomplete types)
- static_assert(__is_layout_compatible(CStructIncomplete, CStructIncomplete));
- static_assert(!__is_layout_compatible(CStruct, CStructIncomplete));
- static_assert(__is_layout_compatible(CStructIncomplete[2], CStructIncomplete[2]));
}
void is_signed()
|
cor3ntin
approved these changes
Apr 6, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a follow-up to #81506. As discussed in #87737, we're rejecting incomplete types, save for exceptions listed in the C++ standard (
voidand arrays of unknown bound). Note that arrays of unknown bound of incomplete types are accepted.Since we're happy with the current behavior of this intrinsic for flexible array members (#87737 (comment)), I added a couple of tests for that as well.