Address review comments

Author: syzaara

llvm/lib/CodeGen/GlobalMerge.cpp

@@ -716,15 +716,16 @@ bool GlobalMergeImpl::run(Module &M) {
       continue;
     auto checkUsers = [] (const GlobalVariable *GV) {
       for (const User *CurrentUser : GV->users()) {
-        if (auto *I = dyn_cast<Instruction>(CurrentUser)) {
-          // Do not merge globals in exception pads.
-          if (I->isEHPad())
+        auto *I = dyn_cast<Instruction>(CurrentUser);
+        if (!I)
+          continue;
+        // Do not merge globals in exception pads.
+        if (I->isEHPad())
+          return false;
+        if (auto *II = dyn_cast<IntrinsicInst>(I)) {
+          // Some intrinsics require a plain global.
+          if (II->getIntrinsicID() == Intrinsic::eh_typeid_for)
             return false;
-          if (auto *II = dyn_cast<IntrinsicInst>(I)) {
-            // Some intrinsics require a plain global.
-            if (II->getIntrinsicID() == Intrinsic::eh_typeid_for)
-              return false;
-          }
         }
       }
       return true;

llvm/lib/Target/PowerPC/CMakeLists.txt

@@ -41,7 +41,6 @@ add_llvm_target(PowerPCCodeGen
   PPCMachineFunctionInfo.cpp
   PPCMachineScheduler.cpp
   PPCMacroFusion.cpp
-  PPCMergeStringPool.cpp
   PPCMIPeephole.cpp
   PPCRegisterInfo.cpp
   PPCSubtarget.cpp

llvm/lib/Target/PowerPC/PPC.h

@@ -53,7 +53,6 @@ class ModulePass;
   FunctionPass *createPPCPreEmitPeepholePass();
   FunctionPass *createPPCExpandAtomicPseudoPass();
   FunctionPass *createPPCCTRLoopsPass();
-  ModulePass *createPPCMergeStringPoolPass();
   void LowerPPCMachineInstrToMCInst(const MachineInstr *MI, MCInst &OutMI,
                                     AsmPrinter &AP);
   bool LowerPPCMachineOperandToMCOperand(const MachineOperand &MO,
@@ -79,7 +78,6 @@ class ModulePass;
   void initializePPCExpandAtomicPseudoPass(PassRegistry &);
   void initializePPCCTRLoopsPass(PassRegistry &);
   void initializePPCDAGToDAGISelLegacyPass(PassRegistry &);
-  void initializePPCMergeStringPoolPass(PassRegistry &);
 
   extern char &PPCVSXFMAMutateID;
 

llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp

@@ -150,7 +150,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializePowerPCTarget() {
   initializeGlobalISel(PR);
   initializePPCCTRLoopsPass(PR);
   initializePPCDAGToDAGISelLegacyPass(PR);
-  initializePPCMergeStringPoolPass(PR);
 }
 
 static bool isLittleEndianTriple(const Triple &T) {