[HLSL] Prevent uninitialized on 2 int arguments#173352
Merged
Conversation
Unparsed HLSL semantics have 2 int/bool arguments with default values. Those values are loaded using checkUInt32Argument, and thus this should never fail. But if something is wrong in the code above (or the def changed), this code wouldn't catch it and we'd read uninitialized integers. This commits checks both return values and assert if one fails. On release builds, this would early return, causing a bad codegen, but such change will be caught by tests.
Member
|
@llvm/pr-subscribers-hlsl @llvm/pr-subscribers-clang Author: Nathan Gauër (Keenuts) ChangesUnparsed HLSL semantics have 2 int/bool arguments with default values. Those values are loaded using checkUInt32Argument, and thus this should never fail. But if something is wrong in the code above (or the def changed), this code wouldn't catch it and we'd read uninitialized integers. This commits checks both return values and assert if one fails. On release builds, this would early return, causing a bad codegen, but such change will be caught by tests. Full diff: https://github.com/llvm/llvm-project/pull/173352.diff 1 Files Affected:
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
index 06130c985876f..0b1996b4789d6 100644
--- a/clang/lib/Sema/SemaHLSL.cpp
+++ b/clang/lib/Sema/SemaHLSL.cpp
@@ -1908,9 +1908,11 @@ void SemaHLSL::diagnoseSystemSemanticAttr(Decl *D, const ParsedAttr &AL,
}
void SemaHLSL::handleSemanticAttr(Decl *D, const ParsedAttr &AL) {
- uint32_t IndexValue, ExplicitIndex;
- SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(0), IndexValue);
- SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(1), ExplicitIndex);
+ uint32_t IndexValue(0), ExplicitIndex(0);
+ if (!SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(0), IndexValue) ||
+ !SemaRef.checkUInt32Argument(AL, AL.getArgAsExpr(1), ExplicitIndex)) {
+ assert(0 && "HLSLUnparsedSemantic is expected to have 2 int arguments.");
+ }
assert(IndexValue > 0 ? ExplicitIndex : true);
std::optional<unsigned> Index =
ExplicitIndex ? std::optional<unsigned>(IndexValue) : std::nullopt;
|
luciechoi
approved these changes
Dec 29, 2025
mahesh-attarde
pushed a commit
to mahesh-attarde/llvm-project
that referenced
this pull request
Jan 6, 2026
Unparsed HLSL semantics have 2 int/bool arguments with default values. Those values are loaded using checkUInt32Argument, and thus this should never fail. But if something is wrong in the code above (or the def changed), this code wouldn't catch it and we'd read uninitialized integers. This commits checks both return values and assert if one fails. On release builds, this would early return, causing a bad codegen, but such change will be caught by tests.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Unparsed HLSL semantics have 2 int/bool arguments with default values. Those values are loaded using checkUInt32Argument, and thus this should never fail.
But if something is wrong in the code above (or the def changed), this code wouldn't catch it and we'd read uninitialized integers. This commits checks both return values and assert if one fails. On release builds, this would early return, causing a bad codegen, but such change will be caught by tests.