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 | d4860003871af3b1004bef4c070307534624e278 (patch) | |
| tree | 1be2b7b006b53bb2f9e3733a0dd57be33c10e6ff /llvm/lib/CodeGen/GlobalMerge.cpp | |
| parent | a94e7b6acf15afbac93181f49cf23b9a3cea3df5 (diff) | |
| download | bcm5719-llvm-d4860003871af3b1004bef4c070307534624e278.tar.gz bcm5719-llvm-d4860003871af3b1004bef4c070307534624e278.zip | |
Fix dropped conditional in cleanup in r245752
Code review feedback by Charlie Turner.
llvm-svn: 245954
Diffstat (limited to 'llvm/lib/CodeGen/GlobalMerge.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/GlobalMerge.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |
