Skip to content

[HLSL][NFC] Builtin type declaration builder cleanup #160375

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 1 commit into from
Sep 23, 2025
Merged

[HLSL][NFC] Builtin type declaration builder cleanup #160375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 6 additions & 18 deletions clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addHandleMember(
// Adds default constructor to the resource class:
// Resource::Resource()
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

using PH = BuiltinTypeMethodBuilder::PlaceHolder;
QualType HandleType = getResourceHandleField()->getType();
Expand All @@ -773,8 +772,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
// return tmp;
// }
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromBinding() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

using PH = BuiltinTypeMethodBuilder::PlaceHolder;
ASTContext &AST = SemaRef.getASTContext();
Expand Down Expand Up @@ -811,8 +809,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromBinding() {
// return tmp;
// }
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromImplicitBinding() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

using PH = BuiltinTypeMethodBuilder::PlaceHolder;
ASTContext &AST = SemaRef.getASTContext();
Expand All @@ -838,8 +835,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromImplicitBinding() {
}

BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyConstructor() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

ASTContext &AST = SemaRef.getASTContext();
QualType RecordType = AST.getCanonicalTagType(Record);
Expand All @@ -857,8 +853,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyConstructor() {
}

BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyAssignmentOperator() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

ASTContext &AST = SemaRef.getASTContext();
QualType RecordType = AST.getCanonicalTagType(Record);
Expand Down Expand Up @@ -889,8 +884,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addArraySubscriptOperators() {
}

BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addLoadMethods() {
if (Record->isCompleteDefinition())
return *this;
assert(!Record->isCompleteDefinition() && "record is already complete");

ASTContext &AST = Record->getASTContext();
IdentifierInfo &II = AST.Idents.get("Load", tok::TokenKind::identifier);
Expand Down Expand Up @@ -931,12 +925,6 @@ BuiltinTypeDeclBuilder::getResourceAttrs() const {
return cast<HLSLAttributedResourceType>(HandleType)->getAttrs();
}

// BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::startDefinition() {
// assert(!Record->isCompleteDefinition() && "record is already complete");
// Record->startDefinition();
// return *this;
// }

BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::completeDefinition() {
assert(!Record->isCompleteDefinition() && "record is already complete");
assert(Record->isBeingDefined() &&
Expand Down