From 47c36ab1cd74902d22f0ee81abdf35575f55c7a6 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Tue, 25 Aug 2015 17:01:36 +0000 Subject: [PATCH] Fix dropped conditional in cleanup in r245752 Code review feedback by Charlie Turner. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245954 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/GlobalMerge.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/CodeGen/GlobalMerge.cpp b/lib/CodeGen/GlobalMerge.cpp index 0feff250e64..73543cb3de3 100644 --- a/lib/CodeGen/GlobalMerge.cpp +++ b/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; } -- 2.40.0