review feedback

Author: Keenuts

clang/lib/CodeGen/CGBuiltin.cpp

@@ -1132,14 +1132,14 @@ struct BitTest {
 };
 
 // Returns the first convergence entry/loop/anchor instruction found in |BB|.
-// std::nullopt otherwise.
-std::optional<llvm::IntrinsicInst *> getConvergenceToken(llvm::BasicBlock *BB) {
+// std::nullptr otherwise.
+llvm::IntrinsicInst *getConvergenceToken(llvm::BasicBlock *BB) {
   for (auto &I : *BB) {
     auto *II = dyn_cast<llvm::IntrinsicInst>(&I);
     if (II && isConvergenceControlIntrinsic(II->getIntrinsicID()))
       return II;
   }
-  return std::nullopt;
+  return nullptr;
 }
 
 } // namespace
@@ -1166,19 +1166,15 @@ CodeGenFunction::EmitConvergenceLoop(llvm::BasicBlock *BB,
   Builder.restoreIP(IP);
 
   auto I = AddConvergenceControlAttr(CB, ParentToken);
-  // Controlled convergence is incompatible with uncontrolled convergence.
-  // Removing any old attributes.
-  I->setNotConvergent();
-
   return cast<llvm::IntrinsicInst>(I);
 }
 
 llvm::IntrinsicInst *
 CodeGenFunction::getOrEmitConvergenceEntryToken(llvm::Function *F) {
   auto *BB = &F->getEntryBlock();
-  auto token = getConvergenceToken(BB);
-  if (token.has_value())
-    return token.value();
+  auto *token = getConvergenceToken(BB);
+  if (token)
+    return token;
 
   // Adding a convergence token requires the function to be marked as
   // convergent.
@@ -1198,9 +1194,9 @@ llvm::IntrinsicInst *
 CodeGenFunction::getOrEmitConvergenceLoopToken(const LoopInfo *LI) {
   assert(LI != nullptr);
 
-  auto token = getConvergenceToken(LI->getHeader());
-  if (token.has_value())
-    return *token;
+  auto *token = getConvergenceToken(LI->getHeader());
+  if (token)
+    return token;
 
   llvm::IntrinsicInst *PII =
       LI->getParent()

clang/lib/CodeGen/CGCall.cpp

@@ -5686,8 +5686,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   if (!CI->getType()->isVoidTy())
     CI->setName("call");
 
-  if (getTarget().getTriple().isSPIRVLogical() &&
-      CI->getCalledFunction()->isConvergent())
+  if (getTarget().getTriple().isSPIRVLogical() && CI->isConvergent())
     CI = AddControlledConvergenceAttr(CI);
 
   // Update largest vector width from the return type.

clang/lib/CodeGen/CGLoopInfo.h

@@ -297,7 +297,6 @@ class LoopInfoStack {
 
   /// Returns true if there is LoopInfo on the stack.
   bool hasInfo() const { return !Active.empty(); }
-
   /// Return the LoopInfo for the current loop. HasInfo should be called
   /// first to ensure LoopInfo is present.
   const LoopInfo &getInfo() const { return *Active.back(); }