Skip to content

[HLSL] Add empty struct test cases to __builtin_hlsl_is_typed_resource_element_compatible test file #115045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 15, 2024
Merged

[HLSL] Add empty struct test cases to __builtin_hlsl_is_typed_resource_element_compatible test file #115045

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef4a7ee
add empty struct test cases
bob80905 Nov 5, 2024
0ed4809
remove assert, return false instead
bob80905 Nov 5, 2024
65c6e1a
address chris
bob80905 Nov 6, 2024
3456c14
address chris, remove homogeneity check and buildFlattenedList call
bob80905 Nov 7, 2024
c912bfd
simplify logic, address chris
bob80905 Nov 8, 2024
90a73b8
add more test cases
bob80905 Nov 13, 2024
b3b8afb
add bool and enum cases, including vector of bools
bob80905 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,8 +2210,10 @@ bool SemaHLSL::IsTypedResourceElementCompatible(clang::QualType QT) {
llvm::SmallVector<QualType, 4> QTTypes;
BuildFlattenedTypeList(QT, QTTypes);

assert(QTTypes.size() > 0 &&
"expected at least one constituent type from non-null type");
// empty structs are not typed resource element compatible
if (QTTypes.size() == 0)
return false;

QualType FirstQT = SemaRef.Context.getCanonicalType(QTTypes[0]);

// element count cannot exceed 4
Expand Down
11 changes: 11 additions & 0 deletions clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,14 @@ struct TypeDefTest {
};

_Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(TypeDefTest), "");
Copy link
Collaborator

@llvm-beanz llvm-beanz Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to remove all these tests, or just update them to expect false results?

Copy link
Contributor Author

@bob80905 bob80905 Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They could be left in and switched to false, but it doesn't seem valuable. All structs are disallowed, so I think just one struct test would suffice.


struct EmptyStruct {};
_Static_assert(!__builtin_hlsl_is_typed_resource_element_compatible(EmptyStruct), "");

struct EmptyDerived : EmptyStruct {};
_Static_assert(!__builtin_hlsl_is_typed_resource_element_compatible(EmptyDerived), "");

struct EmptyBase : EmptyStruct {
int4 V;
};
_Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(EmptyBase), "");
1 change: 0 additions & 1 deletion clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatibleErrors.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(__hlsl_resour
struct notComplete;
// expected-error@+1{{incomplete type 'notComplete' where a complete type is required}}
_Static_assert(!__builtin_hlsl_is_typed_resource_element_compatible(notComplete), "");

Loading