[DeadArgumentElim] Set pointer to DISubprogram before calling RAUW. NFC

[djtodoro]

Summary

It is better to update pointer of the DISuprogram before we call RAUW for still live arguments of the function, because with D42541 in RAUW we compare DISubprograms rather than functions itself.

[aprantl]

The change LGTM, but now I wonder why this didn't break any tests. Are we missing coverage here?

[djtodoro]

@aprantl All test cases pass. That is why RAUW has redundant check (getLocalFunctionMetadata for From and To). Maybe in some cases LLVM PASS just did not get the place where actually it updates the pointer to the DISubprogram (or it was pointer to the function before D42541) and if it is null at that particular point that does not mean that it clobbers dbg info (because it would be != than other metadata at the time).

[aprantl]

ok

[mattd]

@djtodoro thanks, this change looks nice, it makes the code easier to read too!
Just a suggestion, could we just set the Subprogram earlier where we set all of the
more basic properties of the function, when NF is created around line 819, or is
that too soon?

[djtodoro]

@mattd Thanks! I don't see any obstacle to do that, it sounds good to me to set it even earlier.
@aprantl what do you think?

[aprantl]

Works for me.

[mattd]

Thanks @djtodoro! LGTM

llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp

bool DeadArgumentEliminationPass::RemoveDeadStuffFromFunction(Function *F) {
   NF->copyAttributesFrom(F);
   NF->setComdat(F->getComdat());
   NF->setAttributes(NewPAL);
   // Insert the new function before the old function, so we won't be processing
   // it again.
   F->getParent()->getFunctionList().insert(F->getIterator(), NF);
   NF->takeName(F);
 
+  // Patch the pointer to LLVM function in debug info descriptor.
+  NF->setSubprogram(F->getSubprogram());
+
   // Loop over all of the callers of the function, transforming the call sites
   // to pass in a smaller number of arguments into the new function.
   std::vector<Value*> Args;
   while (!F->use_empty()) {
     CallSite CS(F->user_back());
     Instruction *Call = CS.getInstruction();
 
     ArgAttrVec.clear();
for (BasicBlock &BB : *NF)
             }
         }
         // Replace the return instruction with one returning the new return
         // value (possibly 0 if we became void).
         ReturnInst::Create(F->getContext(), RetVal, RI);
         BB.getInstList().erase(RI);
       }
 
-  // Patch the pointer to LLVM function in debug info descriptor.
-  NF->setSubprogram(F->getSubprogram());
-
   // Now that the old function is dead, delete it.
   F->eraseFromParent();
 
   return true;
 }
 
 PreservedAnalyses DeadArgumentEliminationPass::run(Module &M,
                                                    ModuleAnalysisManager &) {