In elfpackager we want to ensure the output is always the same when the same file gets passed in. Currently it would give different outputs because we were using std::sets with pointer values. These pointer values are inconsistent run to run. The fix was to add StringRef which remain constant

Change-Id: I80d908cdc6e7120ca98d76a0315c1cc90ce21f60

Author: paigeale

IGC/ElfPackager/main.cpp

@@ -105,7 +105,7 @@ void CreateElfSection(CLElfLib::CElfWriter* pWriter, CLElfLib::SSectionNode sect
 std::unique_ptr<Module> LocalCloneModule(
 	const Module *M, ValueToValueMapTy &VMap,
     std::vector<GlobalValue*> &ExtractValues,
-    std::map<const llvm::Function*, std::set<const llvm::GlobalVariable*>> &FuncMap) {
+    std::map<const llvm::Function*, std::set<StringRef>> &FuncMap) {
 	// First off, we need to create the new module.
 	std::unique_ptr<Module> New =
 		llvm::make_unique<Module>(M->getModuleIdentifier(), M->getContext());
@@ -177,7 +177,7 @@ std::unique_ptr<Module> LocalCloneModule(
         auto funcGlobalSet = FuncMap[&*I];
         for (auto &global_Iterator : funcGlobalSet)
         {
-            mapGlobal(global_Iterator);
+            mapGlobal(M->getNamedGlobal(global_Iterator));
         }
 
 
@@ -301,15 +301,15 @@ int main(int argc, char *argv[])
         }
     }
 
-    std::map<const llvm::Function*, std::set<const llvm::GlobalVariable*>> FuncToGlobalsMap;
+    std::map<const llvm::Function*, std::set<StringRef>> FuncToGlobalsMap;
 
 	for (auto &iterator3 : GlobalList)
 	{
         std::function<void(User*)> findUsers = [&](User* U)
         {
             if (auto inst = dyn_cast<Instruction>(U))
             {
-                FuncToGlobalsMap[inst->getParent()->getParent()].insert(&iterator3);
+                FuncToGlobalsMap[inst->getParent()->getParent()].insert(iterator3.getName());
                 return;
             }
             else if (auto inst = dyn_cast<GlobalValue>(U))