diff options
author | David Blaikie <dblaikie@gmail.com> | 2015-08-25 17:01:36 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2015-08-25 17:01:36 +0000 |
commit | 47c36ab1cd74902d22f0ee81abdf35575f55c7a6 (patch) | |
tree | 3d49ab364a0801bf4bc122e3a9cf3c80f6f76c67 /lib/CodeGen/GlobalMerge.cpp | |
parent | e922c3ebfc8faab7150219629a051a3b3dc034a4 (diff) |
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
Diffstat (limited to 'lib/CodeGen/GlobalMerge.cpp')
-rw-r--r-- | lib/CodeGen/GlobalMerge.cpp | 7 |
1 files 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; } |