Skip to content
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.

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

Fix crash in DXIL.dll caused by illegal DXIL intrinsic. #6302

Merged
merged 6 commits into from
Feb 20, 2024

Conversation

python3kgae
Copy link
Contributor

Replace assert on illegal DXIL op with return illegal value. Check the illegal cases in validation.

Fixes #6168

Copy link
Contributor

github-actions bot commented Feb 13, 2024

✅ With the latest revision this PR passed the Python code formatter.

Copy link
Contributor

github-actions bot commented Feb 13, 2024

✅ With the latest revision this PR passed the C/C++ code formatter.

lib/DXIL/DxilOperations.cpp Outdated Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Outdated Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Outdated Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Outdated Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@llvm-beanz llvm-beanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I missed on my last pass, and a cleanup nit.

lib/DXIL/DxilShaderFlags.cpp Outdated Show resolved Hide resolved
lib/HLSL/DxilValidation.cpp Outdated Show resolved Hide resolved
Copy link
Member

@pow2clk pow2clk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly speaking up for asserts

lib/DXIL/DxilOperations.cpp Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Show resolved Hide resolved
lib/DXIL/DxilOperations.cpp Show resolved Hide resolved
lib/HLSL/DxilValidation.cpp Show resolved Hide resolved
Copy link
Member

@pow2clk pow2clk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good given Chris's responses to my comments.

@python3kgae python3kgae merged commit 5dee81c into microsoft:main Feb 20, 2024
12 checks passed
@python3kgae python3kgae deleted the dxil_op_check branch February 20, 2024 19:10
python3kgae added a commit that referenced this pull request Feb 22, 2024
Replace assert on illegal DXIL op with return illegal value. Check the
illegal cases in validation.

Fixes #6168

(cherry picked from commit 5dee81c)
tex3d added a commit to tex3d/DirectXShaderCompiler that referenced this pull request Mar 14, 2024
…osoft#6302) (microsoft#6342)"

This file deleted with conflicts from subsequent changes:
  tools/clang/test/LitDXILValidation/illegalDXILOp.ll

This reverts commit 487080f.
tex3d added a commit that referenced this pull request Mar 14, 2024
… (#6342)" (#6418)

This file deleted with conflicts from subsequent changes:
  tools/clang/test/LitDXILValidation/illegalDXILOp.ll

This reverts commit 487080f.

Fixes #6419.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

DXIL.dll crashes on intrinsics that are not defined for a known shader model
3 participants