minor

Author: fabianbs96

include/phasar/PhasarLLVM/Pointer/LLVMPointsToSet.h

@@ -69,7 +69,7 @@ class LLVMPointsToSet : public LLVMPointsToInfo {
                                         const llvm::GlobalObject *VG);
 
   /// Utility function used by computeFunctionsPointsToSet(...)
-  bool addPointer(llvm::AAResults &AA, const llvm::DataLayout &DL,
+  void addPointer(llvm::AAResults &AA, const llvm::DataLayout &DL,
                   const llvm::Value *V, std::vector<const llvm::Value *> &Reps);
 
   [[nodiscard]] static PointsToSetPtrTy getEmptyPointsToSet();

lib/PhasarLLVM/Pointer/LLVMPointsToSet.cpp

@@ -246,7 +246,7 @@ static bool mayAlias(llvm::AAResults &AA, const llvm::DataLayout &DL,
   return false;
 }
 
-bool LLVMPointsToSet::addPointer(llvm::AAResults &AA,
+void LLVMPointsToSet::addPointer(llvm::AAResults &AA,
                                  const llvm::DataLayout &DL,
                                  const llvm::Value *V,
                                  std::vector<const llvm::Value *> &Reps) {

lib/Utils/LLVMShorthands.cpp

@@ -288,9 +288,9 @@ const llvm::Instruction *getNthInstruction(const llvm::Function *F,
 
 std::vector<const llvm::Instruction *>
 getAllExitPoints(const llvm::Function *F) {
-  std::vector<const llvm::Instruction *> ret;
-  appendAllExitPoints(F, ret);
-  return ret;
+  std::vector<const llvm::Instruction *> Ret;
+  appendAllExitPoints(F, Ret);
+  return Ret;
 }
 
 void appendAllExitPoints(const llvm::Function *F,
@@ -300,12 +300,12 @@ void appendAllExitPoints(const llvm::Function *F,
   }
 
   for (const auto &BB : *F) {
-    const auto *term = BB.getTerminator();
-    assert(term && "Invalid IR: Each BasicBlock must have a terminator "
+    const auto *Term = BB.getTerminator();
+    assert(Term && "Invalid IR: Each BasicBlock must have a terminator "
                    "instruction at the end");
-    if (llvm::isa<llvm::ReturnInst>(term) ||
-        llvm::isa<llvm::ResumeInst>(term)) {
-      ExitPoints.push_back(term);
+    if (llvm::isa<llvm::ReturnInst>(Term) ||
+        llvm::isa<llvm::ResumeInst>(Term)) {
+      ExitPoints.push_back(Term);
     }
   }
 }
@@ -441,28 +441,29 @@ bool isStaticVariableLazyInitializationBranch(const llvm::BranchInst *Inst) {
 }
 
 bool isVarAnnotationIntrinsic(const llvm::Function *F) {
-  static const llvm::StringRef kVarAnnotationName("llvm.var.annotation");
-  return F->getName() == kVarAnnotationName;
+  static constexpr llvm::StringLiteral KVarAnnotationName(
+      "llvm.var.annotation");
+  return F->getName() == KVarAnnotationName;
 }
 
 llvm::StringRef getVarAnnotationIntrinsicName(const llvm::CallInst *CallInst) {
-  const int kPointerGlobalStringIdx = 1;
-  auto *ce = llvm::cast<llvm::ConstantExpr>(
-      CallInst->getOperand(kPointerGlobalStringIdx));
-  assert(ce != nullptr);
-  assert(ce->getOpcode() == llvm::Instruction::GetElementPtr);
-  assert(llvm::dyn_cast<llvm::GlobalVariable>(ce->getOperand(0)) != nullptr);
-
-  auto *annoteStr = llvm::dyn_cast<llvm::GlobalVariable>(ce->getOperand(0));
+  const int KPointerGlobalStringIdx = 1;
+  auto *CE = llvm::cast<llvm::ConstantExpr>(
+      CallInst->getOperand(KPointerGlobalStringIdx));
+  assert(CE != nullptr);
+  assert(CE->getOpcode() == llvm::Instruction::GetElementPtr);
+  assert(llvm::dyn_cast<llvm::GlobalVariable>(CE->getOperand(0)) != nullptr);
+
+  auto *AnnoteStr = llvm::dyn_cast<llvm::GlobalVariable>(CE->getOperand(0));
   assert(llvm::dyn_cast<llvm::ConstantDataSequential>(
-      annoteStr->getInitializer()));
+      AnnoteStr->getInitializer()));
 
-  auto *data =
-      llvm::dyn_cast<llvm::ConstantDataSequential>(annoteStr->getInitializer());
+  auto *Data =
+      llvm::dyn_cast<llvm::ConstantDataSequential>(AnnoteStr->getInitializer());
 
   // getAsCString to get rid of the null-terminator
-  assert(data->isCString());
-  return data->getAsCString();
+  assert(Data->isCString());
+  return Data->getAsCString();
 }
 
 } // namespace psr