Small fixes based on code review.

Author: s-perron

llvm/lib/Transforms/Utils/InlineFunction.cpp

@@ -179,21 +179,20 @@ namespace {
       }
     }
   };
+} // end anonymous namespace
 
-  IntrinsicInst *getConevrgenceEntryIfAny(BasicBlock &BB) {
-    auto *I = BB.getFirstNonPHI();
-    while (I) {
-      if (auto *IntrinsicCall = dyn_cast<IntrinsicInst>(I)) {
-        if (IntrinsicCall->getIntrinsicID() ==
-            Intrinsic::experimental_convergence_entry) {
-          return IntrinsicCall;
-        }
+static  IntrinsicInst *getConvergenceEntry(BasicBlock &BB) {
+  auto *I = BB.getFirstNonPHI();
+  while (I) {
+    if (auto *IntrinsicCall = dyn_cast<ConvergenceControlInst>(I)) {
+      if (IntrinsicCall->isEntry()) {
+        return IntrinsicCall;
       }
-      I = I->getNextNode();
     }
-    return nullptr;
+    I = I->getNextNode();
   }
-} // end anonymous namespace
+  return nullptr;
+}
 
 /// Get or create a target for the branch from ResumeInsts.
 BasicBlock *LandingPadInliningInfo::getInnerResumeDest() {
@@ -2451,8 +2450,8 @@ llvm::InlineResult llvm::InlineFunction(CallBase &CB, InlineFunctionInfo &IFI,
   // fully implements convergence control tokens, there is no mixing of
   // controlled and uncontrolled convergent operations in the whole program.
   if (CB.isConvergent()) {
-    auto *I = getConevrgenceEntryIfAny(CalledFunc->getEntryBlock());
-    if (I && !ConvergenceControlToken) {
+    if (!ConvergenceControlToken &&
+        getConvergenceEntry(CalledFunc->getEntryBlock())) {
       return InlineResult::failure(
           "convergent call needs convergencectrl operand");
     }
@@ -2745,7 +2744,7 @@ llvm::InlineResult llvm::InlineFunction(CallBase &CB, InlineFunctionInfo &IFI,
   }
 
   if (ConvergenceControlToken) {
-    auto *IntrinsicCall = getConevrgenceEntryIfAny(*FirstNewBlock);
+    auto *IntrinsicCall = getConvergenceEntry(*FirstNewBlock);
     if (IntrinsicCall) {
       IntrinsicCall->replaceAllUsesWith(ConvergenceControlToken);
       IntrinsicCall->eraseFromParent();