Skip to content

[HLSL] Allow EmptyDecl in cbuffer/tbuffer #128250

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 2 commits into from
Feb 26, 2025
+14 −2
Merged

[HLSL] Allow EmptyDecl in cbuffer/tbuffer #128250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98d8a84
[HLSL] Allow EmptyDecl in cbuffer/tbuffer
llvm-beanz Feb 21, 2025
2494565
Update comment
llvm-beanz Feb 22, 2025
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
4 changes: 2 additions & 2 deletions clang/lib/Parse/ParseHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ static bool validateDeclsInsideHLSLBuffer(Parser::DeclGroupPtrTy DG,
return false;
DeclGroupRef Decls = DG.get();
bool IsValid = true;
// Only allow function, variable, record decls inside HLSLBuffer.
// Only allow function, variable, record, and empty decls inside HLSLBuffer.
for (DeclGroupRef::iterator I = Decls.begin(), E = Decls.end(); I != E; ++I) {
Decl *D = *I;
if (isa<CXXRecordDecl, RecordDecl, FunctionDecl, VarDecl>(D))
if (isa<CXXRecordDecl, RecordDecl, FunctionDecl, VarDecl, EmptyDecl>(D))
continue;

// FIXME: support nested HLSLBuffer and namespace inside HLSLBuffer.
Expand Down
12 changes: 12 additions & 0 deletions clang/test/SemaHLSL/cb_error.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,15 @@ tbuffer B {
// expected-error@+1 {{unknown type name 'flaot'}}
flaot f;
}

// None of these should produce an error!
cbuffer EmptyCBuffer {}

cbuffer EmptyDeclCBuffer {
;
}

cbuffer EmptyDecl2CBuffer {
;
int X;
}