Skip to content

Fix typo of register -> registers crashes DXC with segfault #7729

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix typo of register -> registers crashes DXC with segfault #7729

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
2bbd043
Register assignments with mismatching ': register()' syntax now doesn…
Nielsbishere Sep 3, 2025
9e78ab3
Clang format
Nielsbishere Sep 3, 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
2 changes: 2 additions & 0 deletions tools/clang/include/clang/Basic/DiagnosticParseKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,8 @@ def warn_hlsl_effect_technique : Warning <
def warn_hlsl_semantic_identifier_collision : Warning <
"'%0' interpreted as semantic; previous definition(s) ignored">,
InGroup< HLSLSemanticIdentifierCollision >;
def err_hlsl_register_is_misspelled : Error <
"Syntax similar to : register() was used but unexpected keyword '%0' was used instead.">;
def err_hlsl_enum : Error<
"enum is unsupported in HLSL before 2017">;
def warn_hlsl_new_feature : Warning <
Expand Down
3 changes: 3 additions & 0 deletions tools/clang/include/clang/Parse/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2098,6 +2098,9 @@ class Parser : public CodeCompletionHandler {

// HLSL Change Starts: Parse HLSL Attributes and append them to Declarator Object
bool MaybeParseHLSLAttributes(std::vector<hlsl::UnusualAnnotation *> &target);
bool ConsumeRegisterAssignment(
hlsl::RegisterAssignment
&asg); // Make sure it starts with register( first
inline bool MaybeParseHLSLAttributes(Declarator &D) {
return MaybeParseHLSLAttributes(D.UnusualAnnotations);
}
Expand Down
271 changes: 152 additions & 119 deletions tools/clang/lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,143 @@ static void ParseSpaceForHLSL(const StringRef name,
}
}

bool Parser::ConsumeRegisterAssignment(hlsl::RegisterAssignment &r) {

ASTContext &context = getActions().getASTContext();

if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}

StringRef identifierText = Tok.getIdentifierInfo()->getName();
if (IsShaderProfileLike(identifierText) ||
IsShaderProfileShort(identifierText)) {
r.ShaderProfile = Tok.getIdentifierInfo()->getName();
ConsumeToken(); // consume shader model
if (ExpectAndConsume(tok::comma, diag::err_expected)) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
}

if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}

DXASSERT(Tok.is(tok::identifier),
"otherwise previous code should have failed");
unsigned diagId;

bool hasOnlySpace = false;
identifierText = Tok.getIdentifierInfo()->getName();
if (identifierText.substr(0, sizeof("space") - 1).equals("space")) {
hasOnlySpace = true;
} else {
ParseRegisterNumberForHLSL(Tok.getIdentifierInfo()->getName(),
&r.RegisterType, &r.RegisterNumber, &diagId);
if (diagId == 0) {
r.setIsValid(true);
} else {
r.setIsValid(false);
Diag(Tok.getLocation(), diagId);
}

ConsumeToken(); // consume register (type'#')

ExprResult subcomponentResult;
if (Tok.is(tok::l_square)) {
BalancedDelimiterTracker brackets(*this, tok::l_square);
brackets.consumeOpen();

ExprResult result;
if (Tok.isNot(tok::r_square)) {
subcomponentResult = ParseConstantExpression();
r.IsValid = r.IsValid && !subcomponentResult.isInvalid();
Expr::EvalResult evalResult;
if (!subcomponentResult.get()->EvaluateAsRValue(evalResult, context) ||
evalResult.hasSideEffects() ||
(!evalResult.Val.isInt() && !evalResult.Val.isFloat())) {
Diag(Tok.getLocation(),
diag::err_hlsl_unsupported_register_noninteger);
r.setIsValid(false);
} else {
llvm::APSInt intResult;
if (evalResult.Val.isFloat()) {
bool isExact;
// TODO: consider what to do when convertToInteger fails
evalResult.Val.getFloat().convertToInteger(
intResult, llvm::APFloat::roundingMode::rmTowardZero, &isExact);
} else {
DXASSERT(
evalResult.Val.isInt(),
"otherwise prior test in this function should have failed");
intResult = evalResult.Val.getInt();
}

if (intResult.isNegative()) {
Diag(Tok.getLocation(),
diag::err_hlsl_unsupported_register_noninteger);
r.setIsValid(false);
} else {
r.RegisterOffset = intResult.getLimitedValue();
}
}
} else {
Diag(Tok.getLocation(), diag::err_expected_expression);
r.setIsValid(false);
}

if (brackets.consumeClose()) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
}
}
if (hasOnlySpace) {
uint32_t RegisterSpaceValue = 0;
ParseSpaceForHLSL(Tok.getIdentifierInfo()->getName(), &RegisterSpaceValue,
&diagId);
if (diagId != 0) {
Diag(Tok.getLocation(), diagId);
r.setIsValid(false);
} else {
r.RegisterSpace = RegisterSpaceValue;
r.setIsValid(true);
}
ConsumeToken(); // consume identifier
} else {
if (Tok.is(tok::comma)) {
ConsumeToken(); // consume comma
if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
unsigned RegisterSpaceVal = 0;
ParseSpaceForHLSL(Tok.getIdentifierInfo()->getName(), &RegisterSpaceVal,
&diagId);
if (diagId != 0) {
Diag(Tok.getLocation(), diagId);
r.setIsValid(false);
} else {
r.RegisterSpace = RegisterSpaceVal;
}
ConsumeToken(); // consume identifier
}
}

if (ExpectAndConsume(tok::r_paren, diag::err_expected)) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}

return false;
}

bool Parser::MaybeParseHLSLAttributes(std::vector<hlsl::UnusualAnnotation *> &target)
{
if (!getLangOpts().HLSL) {
Expand Down Expand Up @@ -428,127 +565,9 @@ bool Parser::MaybeParseHLSLAttributes(std::vector<hlsl::UnusualAnnotation *> &ta
if (ExpectAndConsume(tok::l_paren, diag::err_expected_lparen_after, "register")) {
return true;
}
if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}

StringRef identifierText = Tok.getIdentifierInfo()->getName();
if (IsShaderProfileLike(identifierText) || IsShaderProfileShort(identifierText)) {
r.ShaderProfile = Tok.getIdentifierInfo()->getName();
ConsumeToken(); // consume shader model
if (ExpectAndConsume(tok::comma, diag::err_expected)) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
}

if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}

DXASSERT(Tok.is(tok::identifier), "otherwise previous code should have failed");
unsigned diagId;

bool hasOnlySpace = false;
identifierText = Tok.getIdentifierInfo()->getName();
if (identifierText.substr(0, sizeof("space")-1).equals("space")) {
hasOnlySpace = true;
} else {
ParseRegisterNumberForHLSL(
Tok.getIdentifierInfo()->getName(), &r.RegisterType, &r.RegisterNumber, &diagId);
if (diagId == 0) {
r.setIsValid(true);
} else {
r.setIsValid(false);
Diag(Tok.getLocation(), diagId);
}

ConsumeToken(); // consume register (type'#')

ExprResult subcomponentResult;
if (Tok.is(tok::l_square)) {
BalancedDelimiterTracker brackets(*this, tok::l_square);
brackets.consumeOpen();

ExprResult result;
if (Tok.isNot(tok::r_square)) {
subcomponentResult = ParseConstantExpression();
r.IsValid = r.IsValid && !subcomponentResult.isInvalid();
Expr::EvalResult evalResult;
if (!subcomponentResult.get()->EvaluateAsRValue(evalResult, context) ||
evalResult.hasSideEffects() ||
(!evalResult.Val.isInt() && !evalResult.Val.isFloat())) {
Diag(Tok.getLocation(), diag::err_hlsl_unsupported_register_noninteger);
r.setIsValid(false);
} else {
llvm::APSInt intResult;
if (evalResult.Val.isFloat()) {
bool isExact;
// TODO: consider what to do when convertToInteger fails
evalResult.Val.getFloat().convertToInteger(intResult, llvm::APFloat::roundingMode::rmTowardZero, &isExact);
} else {
DXASSERT(evalResult.Val.isInt(), "otherwise prior test in this function should have failed");
intResult = evalResult.Val.getInt();
}

if (intResult.isNegative()) {
Diag(Tok.getLocation(), diag::err_hlsl_unsupported_register_noninteger);
r.setIsValid(false);
} else {
r.RegisterOffset = intResult.getLimitedValue();
}
}
} else {
Diag(Tok.getLocation(), diag::err_expected_expression);
r.setIsValid(false);
}

if (brackets.consumeClose()) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
}
}
if (hasOnlySpace) {
uint32_t RegisterSpaceValue = 0;
ParseSpaceForHLSL(Tok.getIdentifierInfo()->getName(), &RegisterSpaceValue, &diagId);
if (diagId != 0) {
Diag(Tok.getLocation(), diagId);
r.setIsValid(false);
} else {
r.RegisterSpace = RegisterSpaceValue;
r.setIsValid(true);
}
ConsumeToken(); // consume identifier
} else {
if (Tok.is(tok::comma)) {
ConsumeToken(); // consume comma
if (!Tok.is(tok::identifier)) {
Diag(Tok.getLocation(), diag::err_expected) << tok::identifier;
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
return true;
}
unsigned RegisterSpaceVal = 0;
ParseSpaceForHLSL(Tok.getIdentifierInfo()->getName(), &RegisterSpaceVal, &diagId);
if (diagId != 0) {
Diag(Tok.getLocation(), diagId);
r.setIsValid(false);
}
else {
r.RegisterSpace = RegisterSpaceVal;
}
ConsumeToken(); // consume identifier
}
}

if (ExpectAndConsume(tok::r_paren, diag::err_expected)) {
SkipUntil(tok::r_paren, StopAtSemi); // skip through )
if (ConsumeRegisterAssignment(r))
return true;
}

target.push_back(new (context) hlsl::RegisterAssignment(r));
}
Expand Down Expand Up @@ -633,6 +652,20 @@ bool Parser::MaybeParseHLSLAttributes(std::vector<hlsl::UnusualAnnotation *> &ta
Actions.DiagnoseSemanticDecl(pUA);
ConsumeToken(); // consume semantic

// Likely a misspell of register() or a mismatching macro:
// registers() would cause a crash without this fix.

if (Tok.is(tok::l_paren)) {

Diag(Tok.getLocation(), diag::err_hlsl_register_is_misspelled)
<< semanticName;

ConsumeParen();
hlsl::RegisterAssignment dummy;
if (ConsumeRegisterAssignment(dummy)) // Skip invalid syntax
return true;
}

target.push_back(pUA);
}
else {
Expand Down