[NFC] Cleanup for compiler warnings (llvm#700)

ronlieb · web-flow · commit 29f226ff2eb9 · 2025-02-18T01:12:28.000-05:00
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -9572,8 +9572,8 @@ static void emitTargetCallKernelLaunch(
               CGF.Builder.CreateAlloca(RedVarType, nullptr, "d_team_vals");
           Address DTeamValsAddr(DTeamValsInst, RedVarType,
                                 Context.getTypeAlignInChars(RedVarQualType));
-          llvm::Value *NullPtrDTeamVals =
-              llvm::ConstantPointerNull::get(RedVarType->getPointerTo());
+          llvm::Value *NullPtrDTeamVals = llvm::ConstantPointerNull::get(
+              llvm::PointerType::get(CGF.getLLVMContext(), /*AddressSpace=*/0));
           CGF.Builder.CreateStore(NullPtrDTeamVals, DTeamValsAddr);
         } else {
           // dteam_vals = omp_target_alloc(sizeof(red-type) * num_teams, devid)
@@ -9665,8 +9665,8 @@ static void emitTargetCallKernelLaunch(
           Address DTeamsDoneAddr(
               DTeamsDonePtrInst, CGF.Int32Ty,
               Context.getTypeAlignInChars(Context.UnsignedIntTy));
-          llvm::Value *NullPtrDTeamsDone =
-              llvm::ConstantPointerNull::get(CGF.Int32Ty->getPointerTo());
+          llvm::Value *NullPtrDTeamsDone = llvm::ConstantPointerNull::get(
+              llvm::PointerType::get(CGF.getLLVMContext(), /*AddressSpace=*/0));
           CGF.Builder.CreateStore(NullPtrDTeamsDone, DTeamsDoneAddr);
         } else {
           // uint32 teams_done = 0
diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
@@ -560,6 +560,7 @@ void CodeGenFunction::EmitNoLoopXteamScanPhaseTwoCode(
 
     Address XteamRedSumArg1 = GetAddrOfLocalVar((*Args)[RVI.ArgPos]);
     llvm::Value *DTeamVals = Builder.CreateLoad(XteamRedSumArg1);
+    (void)DTeamVals;
 
     Address XteamRedSumArg3 = GetAddrOfLocalVar((*Args)[RVI.ArgPos + 2]);
     llvm::Value *DScanStorage = Builder.CreateLoad(XteamRedSumArg3);
@@ -850,9 +851,6 @@ void CodeGenFunction::EmitXteamScanPhaseTwo(const ForStmt *FStmt,
       DSegmentVals = DScanStorage;
     }
 
-    const Expr *OrigRedVarExpr = RVI.RedVarExpr;
-    const DeclRefExpr *DRE = cast<DeclRefExpr>(OrigRedVarExpr);
-    Address OrigRedVarAddr = EmitLValue(DRE).getAddress();
     RT.getXteamScanPhaseTwo(*this, Builder.CreateLoad(RVI.RedVarAddr),
                             SegmentSize, DTeamVals, DScanStorage, DSegmentVals,
                             ThreadStartIdx, BlockSize, IsInclusiveScan);
diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp
@@ -393,17 +393,17 @@ void CodeGenFunction::InitializeXteamRedCapturedVars(
       Builder.CreateAlloca(RedVarType, nullptr, "d_team_vals");
   Address DTeamValsAddr(DTeamValsInst, RedVarType,
                         Context.getTypeAlignInChars(RedVarQualType));
-  llvm::Value *NullPtrDTeamVals =
-      llvm::ConstantPointerNull::get(RedVarType->getPointerTo());
+  llvm::Value *NullPtrDTeamVals = llvm::ConstantPointerNull::get(
+      llvm::PointerType::get(getLLVMContext(), /*AddressSpace=*/0));
   Builder.CreateStore(NullPtrDTeamVals, DTeamValsAddr);
 
   // Placeholder for d_teams_done_ptr initialized to nullptr
   llvm::Value *DTeamsDonePtrInst =
       Builder.CreateAlloca(Int32Ty, nullptr, "d_teams_done_ptr");
   Address DTeamsDoneAddr(DTeamsDonePtrInst, Int32Ty,
                          Context.getTypeAlignInChars(Context.UnsignedIntTy));
-  llvm::Value *NullPtrDTeamsDone =
-      llvm::ConstantPointerNull::get(Int32Ty->getPointerTo());
+  llvm::Value *NullPtrDTeamsDone = llvm::ConstantPointerNull::get(
+      llvm::PointerType::get(getLLVMContext(), /*AddressSpace=*/0));
   Builder.CreateStore(NullPtrDTeamsDone, DTeamsDoneAddr);
 
   assert(DTeamValsInst && "Device team vals pointer cannot be null");
@@ -419,8 +419,8 @@ void CodeGenFunction::InitializeXteamRedCapturedVars(
     Address DScanStorageAddr(
         DScanStorageInst, RedVarType,
         Context.getTypeAlignInChars(Context.UnsignedIntTy));
-    llvm::Value *NullPtrDScanStorage =
-        llvm::ConstantPointerNull::get(RedVarType->getPointerTo());
+    llvm::Value *NullPtrDScanStorage = llvm::ConstantPointerNull::get(
+        llvm::PointerType::get(getLLVMContext(), /*AddressSpace=*/0));
     Builder.CreateStore(NullPtrDScanStorage, DScanStorageAddr);
 
     assert(DScanStorageInst && "Device scan storage pointer cannot be null");
@@ -432,8 +432,8 @@ void CodeGenFunction::InitializeXteamRedCapturedVars(
       Address DSegmentValsAddr(
           DSegmentValsInst, RedVarType,
           Context.getTypeAlignInChars(Context.UnsignedIntTy));
-      llvm::Value *NullPtrDSegmentVals =
-          llvm::ConstantPointerNull::get(RedVarType->getPointerTo());
+      llvm::Value *NullPtrDSegmentVals = llvm::ConstantPointerNull::get(
+          llvm::PointerType::get(getLLVMContext(), /*AddressSpace=*/0));
       Builder.CreateStore(NullPtrDSegmentVals, DSegmentValsAddr);
 
       assert(DSegmentValsInst && "Segment Vals Array pointer cannot be null");
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
@@ -1144,7 +1144,8 @@ class CodeGenFunction : public CodeGenTypeCache {
         if (Temp.getElementType() != TempAddr.emitRawPointer(CGF)->getType())
           Temp = Address(CGF.Builder.CreatePointerBitCastOrAddrSpaceCast(
                              Temp.emitRawPointer(CGF),
-                             TempAddr.emitRawPointer(CGF)->getType()->getPointerTo()),
+                             llvm::PointerType::get(CGF.getLLVMContext(),
+                                                    /*AddressSpace=*/0)),
                          CGF.Int8Ty, TempAddr.getAlignment());
         CGF.Builder.CreateStore(TempAddr.emitRawPointer(CGF), Temp);
         TempAddr = Temp;
diff --git a/clang/unittests/libclang/LibclangTest.cpp b/clang/unittests/libclang/LibclangTest.cpp
@@ -1220,7 +1220,7 @@ static_assert(true, message);
   const char *Args[] = {"-xc++", "-std=c++26"};
   ClangTU = clang_parseTranslationUnit(Index, fileName.c_str(), Args,
                                        std::size(Args), nullptr, 0, TUFlags);
-  ASSERT_EQ(clang_getNumDiagnostics(ClangTU), 0);
+  ASSERT_EQ(clang_getNumDiagnostics(ClangTU), 0u);
   std::optional<CXCursor> staticAssertCsr;
   Traverse([&](CXCursor cursor, CXCursor parent) -> CXChildVisitResult {
     if (cursor.kind == CXCursor_StaticAssert) {
@@ -1229,7 +1229,7 @@ static_assert(true, message);
     return CXChildVisit_Continue;
   });
   ASSERT_TRUE(staticAssertCsr.has_value());
-  size_t argCnt = 0;
+  int argCnt = 0;
   Traverse(*staticAssertCsr, [&argCnt](CXCursor cursor, CXCursor parent) {
     switch (argCnt) {
     case 0:
diff --git a/llvm/include/llvm/Object/OffloadBinary.h b/llvm/include/llvm/Object/OffloadBinary.h
@@ -223,7 +223,7 @@ struct OffloadBundleEntry {
        << ", ID Length = " << IDLength << ", ID = " << ID;
   }
   void dumpURI(raw_ostream &OS, StringRef filePath) {
-    OS << ID.data() << "\tfile:\/\/" << filePath << "#offset=" << Offset
+    OS << ID.data() << "\tfile://" << filePath << "#offset=" << Offset
        << "&size=" << Size << "\n";
   }
 };
@@ -309,8 +309,6 @@ struct OffloadBundleURI {
     case MEMORY_URI:
       parseMemoryURI(str);
       break;
-    default:
-      report_fatal_error("Unrecognized URI type.");
     }
   }
 
@@ -329,7 +327,6 @@ struct OffloadBundleURI {
         str = str.drop_front(OffsetStr.size());
 
         if (str.consume_front("&size=")) {
-          Size;
           str.getAsInteger(10, Size);
         } else
           report_fatal_error("Reading 'size' in URI.");
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2018,7 +2018,7 @@ void DwarfDebug::collectEntityInfo(DwarfCompileUnit &TheCU,
             if (ProcessedLifetimes.insert(L).second) {
               if (auto *AddCU = dyn_cast<DICompileUnit>(GV->getScope())) {
                 AddCULifetimeMap[AddCU].push_back(L);
-              } else if (auto *AddNS = dyn_cast<DINamespace>(GV->getScope())) {
+              } else if (isa<DINamespace>(GV->getScope())) {
                 // FIXME(KZHURAVL): Properly support DINamespace.
               } else if (auto *AddSP = dyn_cast<DISubprogram>(GV->getScope())) {
                 SPLifetimeMap[AddSP].push_back(L);
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
@@ -991,11 +991,9 @@ std::optional<NewOpResult> DwarfExpression::traverse(DIOp::Arg Arg,
     if (IsFragment)
       emitOp(dwarf::DW_OP_lit0);
 
-    unsigned RegSize = 0;
     for (auto &Reg : Regs) {
       if (Reg.SubRegSize % 8)
         return std::nullopt;
-      RegSize += Reg.SubRegSize;
       if (Reg.DwarfRegNo >= 0)
         addReg(Reg.DwarfRegNo, Reg.Comment);
       emitOp(dwarf::DW_OP_piece);
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -1443,7 +1443,7 @@ bool FastISel::selectIntrinsicCall(const IntrinsicInst *II) {
     const DbgDefInst &DDI = *cast<DbgDefInst>(II);
     const Value *Referrer = DDI.getReferrer();
     assert(Referrer);
-    if (const auto *UV = dyn_cast<UndefValue>(Referrer)) {
+    if (isa<UndefValue>(Referrer)) {
       BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, MIMD,
               TII.get(TargetOpcode::DBG_DEF))
           .addMetadata(DDI.getLifetime())
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -689,7 +689,8 @@ FunctionCallee OpenMPIRBuilder::unsignedGetOrCreateAtomicCASRuntimeFunction(
 
   assert(Fn && "Failed to create custom OpenMP atomic CAS runtime function");
   // Cast the function to the expected type if necessary
-  Constant *C = ConstantExpr::getBitCast(Fn, FnTy->getPointerTo());
+  Constant *C = ConstantExpr::getBitCast(
+      Fn, llvm::PointerType::get(Fn->getContext(), /*AddressSpace=*/0));
   return {FnTy, C};
 }
 
diff --git a/llvm/lib/Object/OffloadBinary.cpp b/llvm/lib/Object/OffloadBinary.cpp
@@ -125,7 +125,6 @@ Error extractOffloadBundle(MemoryBufferRef Contents, uint64_t SectionOffset,
         OffloadBundleFatBin::create(*Buffer, SectionOffset + Offset, fileName);
     if (!FatBundleOrErr)
       return FatBundleOrErr.takeError();
-    OffloadBundleFatBin &Bundle = **FatBundleOrErr;
 
     // add current Bundle to list.
     Bundles.emplace_back(std::move(**FatBundleOrErr));
@@ -218,7 +217,6 @@ Error extractFromArchive(const Archive &Library,
 
 Error OffloadBundleFatBin::ReadEntries(StringRef Buffer,
                                        uint64_t SectionOffset) {
-  uint64_t BundleNumber = 0;
   uint64_t NumOfEntries = 0;
 
   // get Reader
@@ -244,7 +242,6 @@ Error OffloadBundleFatBin::ReadEntries(StringRef Buffer,
     uint64_t EntryOffset;
     uint64_t EntryIDSize;
     StringRef EntryID;
-    uint64_t absOffset;
 
     if (auto EC = Reader.readInteger(EntryOffset)) {
       return errorCodeToError(object_error::parse_failed);
@@ -295,7 +292,7 @@ OffloadBundleFatBin::create(MemoryBufferRef Buf, uint64_t SectionOffset,
 Error OffloadBundleFatBin::extractBundle(const ObjectFile &Source) {
   // This will extract all entries in the Bundle
   SmallVectorImpl<OffloadBundleEntry>::iterator it = Entries.begin();
-  for (int64_t I = 0; I < getNumEntries(); I++) {
+  for (uint64_t I = 0; I < getNumEntries(); I++) {
 
     if (it->Size > 0) {
       // create output file name. Which should be
@@ -457,13 +454,8 @@ Error object::extractOffloadBundleFatBinary(
          llvm::file_magic::offload_bundle_compressed)) {
 
       uint64_t SectionOffset = 0;
-      if (Obj.isELF()) {
+      if (Obj.isELF())
         SectionOffset = ELFSectionRef(Sec).getOffset();
-      } else if (Obj.isCOFF()) {
-        if (const COFFObjectFile *COFFObj = dyn_cast<COFFObjectFile>(&Obj)) {
-          const coff_section *CoffSection = COFFObj->getCOFFSection(Sec);
-        }
-      }
 
       MemoryBufferRef Contents(*Buffer, Obj.getFileName());
 
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -2743,7 +2743,7 @@ Instruction *InstCombinerImpl::visitBitCast(BitCastInst &CI) {
   if (DestTy == Src->getType())
     return replaceInstUsesWith(CI, Src);
 
-  if (FixedVectorType *DestVTy = dyn_cast<FixedVectorType>(DestTy)) {
+  if (isa<FixedVectorType>(DestTy)) {
     if (isa<IntegerType>(SrcTy)) {
       // If this is a cast from an integer to vector, check to see if the input
       // is a trunc or zext of a bitcast from vector.  If so, we can replace all
diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -3402,7 +3402,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
       S2_ext = IRB.CreateBitCast(S2_ext, getMMXVectorTy(64));
     }
 
-    Function *ShadowFn = Intrinsic::getDeclaration(
+    Function *ShadowFn = Intrinsic::getOrInsertDeclaration(
         F.getParent(), getSignedPackIntrinsic(I.getIntrinsicID()));
 
     Value *S =
diff --git a/llvm/tools/llvm-objdump/OffloadDump.cpp b/llvm/tools/llvm-objdump/OffloadDump.cpp
@@ -98,7 +98,7 @@ void llvm::dumpOffloadBundleFatBinary(const ObjectFile &O, std::string ArchName)
     // now we have a list of Found Entries .... dump them
     SmallVectorImpl<OffloadBundleEntry>::iterator FoundIter =
         FoundEntries.begin();
-    for (int64_t entry_num = 0; entry_num < FoundEntries.size(); entry_num++) {
+    for (uint64_t entry_num = 0; entry_num < FoundEntries.size(); entry_num++) {
       // create file name for this object file:  <source-filename>:<Bundle
       // Number>.<EntryID>
       std::string str = BundleIter->getFileName().str() + ":" +

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ struct OffloadBundleEntry {`
`223`	`223`	`<< ", ID Length = " << IDLength << ", ID = " << ID;`
`224`	`224`	`}`
`225`	`225`	`void dumpURI(raw_ostream &OS, StringRef filePath) {`
`226`		`- OS << ID.data() << "\tfile:\/\/" << filePath << "#offset=" << Offset`
	`226`	`+ OS << ID.data() << "\tfile://" << filePath << "#offset=" << Offset`
`227`	`227`	`<< "&size=" << Size << "\n";`
`228`	`228`	`}`
`229`	`229`	`};`
`@@ -309,8 +309,6 @@ struct OffloadBundleURI {`
`309`	`309`	`case MEMORY_URI:`
`310`	`310`	`parseMemoryURI(str);`
`311`	`311`	`break;`
`312`		`- default:`
`313`		`- report_fatal_error("Unrecognized URI type.");`
`314`	`312`	`}`
`315`	`313`	`}`
`316`	`314`
`@@ -329,7 +327,6 @@ struct OffloadBundleURI {`
`329`	`327`	`str = str.drop_front(OffsetStr.size());`
`330`	`328`
`331`	`329`	`if (str.consume_front("&size=")) {`
`332`		`- Size;`
`333`	`330`	`str.getAsInteger(10, Size);`
`334`	`331`	`} else`
`335`	`332`	`report_fatal_error("Reading 'size' in URI.");`
Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,8 @@ FunctionCallee OpenMPIRBuilder::unsignedGetOrCreateAtomicCASRuntimeFunction(`
`689`	`689`
`690`	`690`	`assert(Fn && "Failed to create custom OpenMP atomic CAS runtime function");`
`691`	`691`	`// Cast the function to the expected type if necessary`
`692`		`- Constant *C = ConstantExpr::getBitCast(Fn, FnTy->getPointerTo());`
	`692`	`+ Constant *C = ConstantExpr::getBitCast(`
	`693`	`+ Fn, llvm::PointerType::get(Fn->getContext(), /AddressSpace=/0));`
`693`	`694`	`return {FnTy, C};`
`694`	`695`	`}`
`695`	`696`