From 53591233c2265e154cb52e06937b81d6b5ca7bbe Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Fri, 24 Aug 2018 19:31:52 +0000 Subject: [PATCH] [LTO] Fix -save-temps with LTO and unnamed globals. If all LLVM passes are disabled, we can't emit a summary because there could be unnamed globals in the IR. Differential Revision: https://reviews.llvm.org/D51198 llvm-svn: 340640 --- clang/lib/CodeGen/BackendUtil.cpp | 6 ++++-- clang/test/CodeGen/summary-index-unnamed-global.ll | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 clang/test/CodeGen/summary-index-unnamed-global.ll diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 6da284e..3fd01a7 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -783,7 +783,7 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action, break; case Backend_EmitBC: - if (CodeGenOpts.PrepareForThinLTO) { + if (CodeGenOpts.PrepareForThinLTO && !CodeGenOpts.DisableLLVMPasses) { if (!CodeGenOpts.ThinLinkBitcodeFile.empty()) { ThinLinkOS = openOutputFile(CodeGenOpts.ThinLinkBitcodeFile); if (!ThinLinkOS) @@ -796,6 +796,7 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action, // targets bool EmitLTOSummary = (CodeGenOpts.PrepareForLTO && + !CodeGenOpts.DisableLLVMPasses && llvm::Triple(TheModule->getTargetTriple()).getVendor() != llvm::Triple::Apple); if (EmitLTOSummary && !TheModule->getModuleFlag("ThinLTO")) @@ -1014,7 +1015,7 @@ void EmitAssemblyHelper::EmitAssemblyWithNewPassManager( break; case Backend_EmitBC: - if (CodeGenOpts.PrepareForThinLTO) { + if (CodeGenOpts.PrepareForThinLTO && !CodeGenOpts.DisableLLVMPasses) { if (!CodeGenOpts.ThinLinkBitcodeFile.empty()) { ThinLinkOS = openOutputFile(CodeGenOpts.ThinLinkBitcodeFile); if (!ThinLinkOS) @@ -1027,6 +1028,7 @@ void EmitAssemblyHelper::EmitAssemblyWithNewPassManager( // targets bool EmitLTOSummary = (CodeGenOpts.PrepareForLTO && + !CodeGenOpts.DisableLLVMPasses && llvm::Triple(TheModule->getTargetTriple()).getVendor() != llvm::Triple::Apple); if (EmitLTOSummary && !TheModule->getModuleFlag("ThinLTO")) diff --git a/clang/test/CodeGen/summary-index-unnamed-global.ll b/clang/test/CodeGen/summary-index-unnamed-global.ll new file mode 100644 index 0000000..056c386 --- /dev/null +++ b/clang/test/CodeGen/summary-index-unnamed-global.ll @@ -0,0 +1,10 @@ +; RUN: %clang_cc1 -flto -triple x86_64-pc-linux-gnu -emit-llvm-bc -disable-llvm-passes -x ir < %s -o - | llvm-bcanalyzer -dump | FileCheck %s +; RUN: %clang_cc1 -flto=thin -triple x86_64-pc-linux-gnu -emit-llvm-bc -disable-llvm-passes -x ir < %s -o - | llvm-bcanalyzer -dump | FileCheck %s +; RUN: %clang_cc1 -fexperimental-new-pass-manager -flto -triple x86_64-pc-linux-gnu -emit-llvm-bc -disable-llvm-passes -x ir < %s -o - | llvm-bcanalyzer -dump | FileCheck %s +; RUN: %clang_cc1 -fexperimental-new-pass-manager -flto=thin -triple x86_64-pc-linux-gnu -emit-llvm-bc -disable-llvm-passes -x ir < %s -o - | llvm-bcanalyzer -dump | FileCheck %s + +; CHECK-NOT:GLOBALVAL_SUMMARY_BLOCK + +; Make sure this doesn't crash, and we don't try to emit a module summary. +; (The command is roughly emulating what -save-temps would do.) +@0 = global i32 0 -- 2.7.4