Some refactorings to make use of the new helper.

`LibCallsShrinkWrap::perform`: This uses the potentially `nullptr` value
inside the loop in a debug statement before asserting on it. Move the
assertion outside `perform(CallInst &)`.

Some other arbitrary uses to replace `getCalledFunction()->getName()`.

Author: tsymalla

llvm/include/llvm/Analysis/VectorUtils.h

@@ -41,11 +41,10 @@ class VFDatabase {
   /// a vector Function ABI.
   static void getVFABIMappings(const CallInst &CI,
                                SmallVectorImpl<VFInfo> &Mappings) {
-    if (!CI.getCalledFunction())
+    const auto ScalarName = CI.getCalledFunctionName();
+    if (!ScalarName.has_value())
       return;
 
-    const StringRef ScalarName = CI.getCalledFunction()->getName();
-
     SmallVector<std::string, 8> ListOfStrings;
     // The check for the vector-function-abi-variant attribute is done when
     // retrieving the vector variant names here.
@@ -59,7 +58,7 @@ class VFDatabase {
       // ensuring that the variant described in the attribute has a
       // corresponding definition or declaration of the vector
       // function in the Module M.
-      if (Shape && (Shape->ScalarName == ScalarName)) {
+      if (Shape && (Shape->ScalarName == *ScalarName)) {
         assert(CI.getModule()->getFunction(Shape->VectorName) &&
                "Vector function is missing.");
         Mappings.push_back(*Shape);

llvm/lib/Transforms/Utils/InlineFunction.cpp

@@ -1983,7 +1983,7 @@ static void trackInlinedStores(Function::iterator Start, Function::iterator End,
                                const CallBase &CB) {
   LLVM_DEBUG(errs() << "trackInlinedStores into "
                     << Start->getParent()->getName() << " from "
-                    << CB.getCalledFunction()->getName() << "\n");
+                    << *CB.getCalledFunctionName() << "\n");
   const DataLayout &DL = CB.getDataLayout();
   at::trackAssignments(Start, End, collectEscapedLocals(DL, CB), DL);
 }

llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp

@@ -58,8 +58,11 @@ class LibCallsShrinkWrap : public InstVisitor<LibCallsShrinkWrap> {
   bool perform() {
     bool Changed = false;
     for (auto &CI : WorkList) {
-      LLVM_DEBUG(dbgs() << "CDCE calls: " << CI->getCalledFunction()->getName()
-                        << "\n");
+      auto CalleeName = CI->getCalledFunctionName();
+      assert(CalleeName.has_value() &&
+             "perform() should apply to a non-empty callee");
+
+      LLVM_DEBUG(dbgs() << "CDCE calls: " << *CalleeName << "\n");
       if (perform(CI)) {
         Changed = true;
         LLVM_DEBUG(dbgs() << "Transformed\n");
@@ -487,7 +490,6 @@ void LibCallsShrinkWrap::shrinkWrapCI(CallInst *CI, Value *Cond) {
 bool LibCallsShrinkWrap::perform(CallInst *CI) {
   LibFunc Func;
   Function *Callee = CI->getCalledFunction();
-  assert(Callee && "perform() should apply to a non-empty callee");
   TLI.getLibFunc(*Callee, Func);
   assert(Func && "perform() is not expecting an empty function");