From d4860003871af3b1004bef4c070307534624e278 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Tue, 25 Aug 2015 17:01:36 +0000 Subject: Fix dropped conditional in cleanup in r245752 Code review feedback by Charlie Turner. llvm-svn: 245954 --- llvm/lib/CodeGen/GlobalMerge.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'llvm/lib/CodeGen/GlobalMerge.cpp') diff --git a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp index 0feff250e64..73543cb3de3 100644 --- a/llvm/lib/CodeGen/GlobalMerge.cpp +++ b/llvm/lib/CodeGen/GlobalMerge.cpp @@ -569,9 +569,10 @@ bool GlobalMerge::doInitialization(Module &M) { if (P.second.size() > 1) Changed |= doMerge(P.second, M, false, P.first); - for (auto &P : ConstGlobals) - if (P.second.size() > 1) - Changed |= doMerge(P.second, M, true, P.first); + if (EnableGlobalMergeOnConst) + for (auto &P : ConstGlobals) + if (P.second.size() > 1) + Changed |= doMerge(P.second, M, true, P.first); return Changed; } -- cgit v1.2.3