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

Fixed arg pairs not correct for old source in module pdbs #3599

Merged
merged 3 commits into from
Mar 18, 2021

Conversation

adam-yang
Copy link
Contributor

Initializing args for old PDBs (where sources and args are inside the debug module) was going through a different code path, where arg pairs were not being initialized. This change fixes that.

@adam-yang adam-yang requested a review from tex3d March 18, 2021 00:50
Copy link
Contributor

@tex3d tex3d left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Contributor

@tex3d tex3d left a comment

Choose a reason for hiding this comment

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

LGTM!

CComPtr<IDxcBlobEncoding> pProgramHeaderBlob;
IFR(hlsl::DxcCreateBlobWithEncodingFromPinned(program_header, program_header->SizeInUint32*sizeof(UINT32), CP_ACP, &pProgramHeaderBlob));
CComPtr<IDxcBlob> pProgramHeaderBlob;
IFR(hlsl::DxcCreateBlobFromPinned(program_header, program_header->SizeInUint32*sizeof(UINT32), &pProgramHeaderBlob));
Copy link
Contributor

Choose a reason for hiding this comment

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

For both pinned cases, I think we actually want BlobFromBlob (with offset/size).

@AppVeyorBot
Copy link

@adam-yang adam-yang merged commit e8372b9 into microsoft:master Mar 18, 2021
tex3d pushed a commit to tex3d/DirectXShaderCompiler that referenced this pull request Mar 22, 2021
tex3d added a commit that referenced this pull request Mar 23, 2021
Cherry-pick changes to release branch:
cd3ef21 Roll back llvm::ArrayRef dependency in ExecutionTest (#3613)
2791c51 Generate descriptions for resources with no names (#3598)
22fa209 Fix LifetimeIntrinsicTest issues (#3609)
2039610 Fix Dxil validator compat and test issues (#3610)
220e884 Rename payload qualifier field to not match type (#3607)
0e89206 Correct exception handler sprintf for 32-bit (#3608)
9b475a7 Add dxc exception handler (#3604)
e8372b9 Fixed arg pairs not correct for old source in module pdbs (#3599)
2bda44f Add constant evaluation for clamp() (#3581)
640c9af Added way for caller to replace args in PDB utils (#3595)
de00b01 Fix const error check for object subscript operator (#3580)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants