[llvm-commits] CVS: llvm/lib/Transforms/IPO/ConstantMerge.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/IPO:

ConstantMerge.cpp updated: 1.30 -> 1.31
---
Log message:

Fix ConstantMerge/2006-03-07-DontMergeDiffSections.ll, a problem Jim 
hypotheticalized about, where we would incorrectly merge two globals in
different sections.


---
Diffs of the changes:  (+14 -11)

 ConstantMerge.cpp |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.30 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.31
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.30	Thu Apr 21 18:39:37 2005
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Tue Mar  7 11:56:59 2006
@@ -39,7 +39,9 @@
 ModulePass *llvm::createConstantMergePass() { return new ConstantMerge(); }
 
 bool ConstantMerge::runOnModule(Module &M) {
-  std::map<Constant*, GlobalVariable*> CMap;
+  // Map unique constant/section pairs to globals.  We don't want to merge
+  // globals in different sections.
+  std::map<std::pair<Constant*, std::string>, GlobalVariable*> CMap;
 
   // Replacements - This vector contains a list of replacements to perform.
   std::vector<std::pair<GlobalVariable*, GlobalVariable*> > Replacements;
@@ -56,23 +58,24 @@
     // because doing so may cause initializers of other globals to be rewritten,
     // invalidating the Constant* pointers in CMap.
     //
-    for (Module::global_iterator GV = M.global_begin(), E = M.global_end(); GV != E; ++GV)
-      // Only process constants with initializers
+    for (Module::global_iterator GV = M.global_begin(), E = M.global_end();
+         GV != E; ++GV)
+      // Only process constants with initializers.
       if (GV->isConstant() && GV->hasInitializer()) {
         Constant *Init = GV->getInitializer();
 
-        // Check to see if the initializer is already known...
-        std::map<Constant*, GlobalVariable*>::iterator I = CMap.find(Init);
+        // Check to see if the initializer is already known.
+        GlobalVariable *&Slot = CMap[std::make_pair(Init, GV->getSection())];
 
-        if (I == CMap.end()) {    // Nope, add it to the map
-          CMap.insert(I, std::make_pair(Init, GV));
+        if (Slot == 0) {    // Nope, add it to the map.
+          Slot = GV;
         } else if (GV->hasInternalLinkage()) {    // Yup, this is a duplicate!
           // Make all uses of the duplicate constant use the canonical version.
-          Replacements.push_back(std::make_pair(GV, I->second));
-        } else if (I->second->hasInternalLinkage()) {
+          Replacements.push_back(std::make_pair(GV, Slot));
+        } else if (GV->hasInternalLinkage()) {
           // Make all uses of the duplicate constant use the canonical version.
-          Replacements.push_back(std::make_pair(I->second, GV));
-          I->second = GV;
+          Replacements.push_back(std::make_pair(Slot, GV));
+          Slot = GV;
         }
       }