diff options
Diffstat (limited to 'llvm/lib/Target/DirectX/DirectXTargetMachine.cpp')
| -rw-r--r-- | llvm/lib/Target/DirectX/DirectXTargetMachine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp index 59e6fcb..1111bb8 100644 --- a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp +++ b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp @@ -42,6 +42,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeDirectXTarget() { initializeDXILPrepareModulePass(*PR); initializeEmbedDXILPassPass(*PR); initializeWriteDXILPassPass(*PR); + initializeDXContainerGlobalsPass(*PR); initializeDXILOpLoweringLegacyPass(*PR); initializeDXILTranslateMetadataPass(*PR); initializeDXILResourceWrapperPass(*PR); @@ -127,12 +128,6 @@ bool DirectXTargetMachine::addPassesToEmitFile( TargetPassConfig *PassConfig = createPassConfig(PM); PassConfig->addCodeGenPrepare(); - if (TargetPassConfig::willCompleteCodeGenPipeline()) { - PM.add(createDXILEmbedderPass()); - // We embed the other DXContainer globals after embedding DXIL so that the - // globals don't pollute the DXIL. - PM.add(createDXContainerGlobalsPass()); - } switch (FileType) { case CGFT_AssemblyFile: PM.add(createDXILPrettyPrinterPass(Out)); @@ -140,6 +135,11 @@ bool DirectXTargetMachine::addPassesToEmitFile( break; case CGFT_ObjectFile: if (TargetPassConfig::willCompleteCodeGenPipeline()) { + PM.add(createDXILEmbedderPass()); + // We embed the other DXContainer globals after embedding DXIL so that the + // globals don't pollute the DXIL. + PM.add(createDXContainerGlobalsPass()); + if (!MMIWP) MMIWP = new MachineModuleInfoWrapperPass(this); PM.add(MMIWP); |