Skip to content

Commit e5acda7

Browse files
authored
[HLSL][NFC] Builtin type declaration builder cleanup (#160375)
Replace early exit from builder methods with assert - they should be not called on a completed record. Also removes commented-out code.
1 parent 5b40491 commit e5acda7

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addHandleMember(
748748
// Adds default constructor to the resource class:
749749
// Resource::Resource()
750750
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
751-
if (Record->isCompleteDefinition())
752-
return *this;
751+
assert(!Record->isCompleteDefinition() && "record is already complete");
753752

754753
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
755754
QualType HandleType = getResourceHandleField()->getType();
@@ -773,8 +772,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
773772
// return tmp;
774773
// }
775774
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromBinding() {
776-
if (Record->isCompleteDefinition())
777-
return *this;
775+
assert(!Record->isCompleteDefinition() && "record is already complete");
778776

779777
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
780778
ASTContext &AST = SemaRef.getASTContext();
@@ -811,8 +809,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromBinding() {
811809
// return tmp;
812810
// }
813811
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCreateFromImplicitBinding() {
814-
if (Record->isCompleteDefinition())
815-
return *this;
812+
assert(!Record->isCompleteDefinition() && "record is already complete");
816813

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

840837
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyConstructor() {
841-
if (Record->isCompleteDefinition())
842-
return *this;
838+
assert(!Record->isCompleteDefinition() && "record is already complete");
843839

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

859855
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyAssignmentOperator() {
860-
if (Record->isCompleteDefinition())
861-
return *this;
856+
assert(!Record->isCompleteDefinition() && "record is already complete");
862857

863858
ASTContext &AST = SemaRef.getASTContext();
864859
QualType RecordType = AST.getCanonicalTagType(Record);
@@ -889,8 +884,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addArraySubscriptOperators() {
889884
}
890885

891886
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addLoadMethods() {
892-
if (Record->isCompleteDefinition())
893-
return *this;
887+
assert(!Record->isCompleteDefinition() && "record is already complete");
894888

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

934-
// BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::startDefinition() {
935-
// assert(!Record->isCompleteDefinition() && "record is already complete");
936-
// Record->startDefinition();
937-
// return *this;
938-
// }
939-
940928
BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::completeDefinition() {
941929
assert(!Record->isCompleteDefinition() && "record is already complete");
942930
assert(Record->isBeingDefined() &&

0 commit comments

Comments
 (0)