Skip to content

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

Merged
adam-yang merged 3 commits intomicrosoft:masterfrom
adam-yang:old_pdb_recompile_fail
Mar 18, 2021
Merged

Fixed arg pairs not correct for old source in module pdbs#3599
adam-yang merged 3 commits intomicrosoft:masterfrom
adam-yang:old_pdb_recompile_fail

Conversation

@adam-yang
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown

@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