treat invoke like call

[david2050]

Summary

InvokeInst should be treated like CallInst and
assigned a separate discriminator. This is particularly
import when an Invoke is converted to a Call
during compilation and so can invalidate sample profile
data collected wtih different link time optimizations

[wmi]

Could you have a testcase for it?

[david2050]

add test

[wmi]

LGTM.

lib/Transforms/Utils/AddDiscriminators.cpp

239–244

nit: Can we merge it to?

if ((!isa<CallInst>(I) && !isa<InvokeInst>(I)) || isa<IntrinsicInst>(I))
  continue;

[david2050]

simplify loop continue test

lib/Transforms/Utils/AddDiscriminators.cpp

static bool addDiscriminators(Function &F) {
 
   // Traverse all instructions and assign new discriminators to call
   // instructions with the same lineno that are in the same basic block.
   // Sample base profile needs to distinguish different function calls within
   // a same source line for correct profile annotation.
   for (BasicBlock &B : F) {
     LocationSet CallLocations;
     for (auto &I : B.getInstList()) {
-      CallInst *Current = dyn_cast<CallInst>(&I);
       // We bypass intrinsic calls for the following two reasons:
       //  1) We want to avoid a non-deterministic assigment of
       //     discriminators.
       //  2) We want to minimize the number of base discriminators used.
-      if (!Current || isa<IntrinsicInst>(&I))
+      if (isa<CallInst>(I)) {
+        if (isa<IntrinsicInst>(I))
+          continue;
+      }
+      else if(!isa<InvokeInst>(I))
         continue;
 
-      DILocation *CurrentDIL = Current->getDebugLoc();
+      DILocation *CurrentDIL = I.getDebugLoc();
       if (!CurrentDIL)
         continue;
       Location L =
           std::make_pair(CurrentDIL->getFilename(), CurrentDIL->getLine());
       if (!CallLocations.insert(L).second) {
         unsigned Discriminator = ++LDM[L];
         auto NewDIL = CurrentDIL->setBaseDiscriminator(Discriminator);
         if (!NewDIL) {
           LLVM_DEBUG(dbgs()
                      << "Could not encode discriminator: "
                      << CurrentDIL->getFilename() << ":"
                      << CurrentDIL->getLine() << ":" << CurrentDIL->getColumn()
                      << ":" << Discriminator << " " << I << "\n");
         } else {
-          Current->setDebugLoc(NewDIL.getValue());
+          I.setDebugLoc(NewDIL.getValue());
           Changed = true;
         }
       }
     }
   }
   return Changed;
 }