Skip to content

Commit 8089204

Browse files
committed
merged changes from review
2 parents a8a7120 + 449e0aa commit 8089204

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

lib/DXIL/DxilModule.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,10 +1831,10 @@ bool DxilModule::StripNamesSensitiveToDebug() {
18311831

18321832
if (!GetShaderModel()->IsLib()) {
18331833
// Strip struct names
1834-
vector<StructType *> structTypes = m_pModule->getIdentifiedStructTypes();
1835-
unsigned nextStructId = 0;
1836-
for (StructType *structType : structTypes) {
1837-
if (!structType->hasName())
1834+
SmallVector<StructType *,8> structTypes = m_pModule->getIdentifiedStructTypes();
1835+
unsigned NextStructId = 0;
1836+
for (StructType *ST : structTypes) {
1837+
if (!ST->hasName())
18381838
continue;
18391839

18401840
StringRef Name = structType->getName();

tools/clang/tools/dxcompiler/dxclinker.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,8 @@ HRESULT STDMETHODCALLTYPE DxcLinker::Link(
416416
&ShaderHashContent, pReflectionStream, pRootSigStream, nullptr,
417417
nullptr);
418418

419-
if (opts.StripDebug) {
419+
if (opts.StripDebug)
420420
inputs.pM->GetOrCreateDxilModule().StripNamesSensitiveToDebug();
421-
}
422421

423422
if (needsValidation) {
424423
valHR = dxcutil::ValidateAndAssembleToContainer(inputs);

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,9 +1048,8 @@ class DxcCompiler : public IDxcCompiler3,
10481048

10491049
inputs.pVersionInfo = static_cast<IDxcVersionInfo *>(this);
10501050

1051-
if (opts.StripDebug) {
1051+
if (opts.StripDebug)
10521052
inputs.pM->GetOrCreateDxilModule().StripNamesSensitiveToDebug();
1053-
}
10541053

10551054
if (needsValidation) {
10561055
valHR = dxcutil::ValidateAndAssembleToContainer(inputs);

0 commit comments

Comments
 (0)