Author: Nikita Popov Date: 2024-09-23T16:30:50+02:00 New Revision: ecb98f9fed65801d9ad2c138da7194496e18aeec
URL: https://github.com/llvm/llvm-project/commit/ecb98f9fed65801d9ad2c138da7194496e18aeec DIFF: https://github.com/llvm/llvm-project/commit/ecb98f9fed65801d9ad2c138da7194496e18aeec.diff LOG: [IRBuilder] Remove uses of CreateGlobalStringPtr() (NFC) Since the migration to opaque pointers, CreateGlobalStringPtr() is the same as CreateGlobalString(). Normalize to the latter. Added: Modified: clang/lib/CodeGen/CGBuiltin.cpp clang/lib/CodeGen/CGExprScalar.cpp llvm/include/llvm-c/Core.h llvm/lib/CodeGen/StackProtector.cpp llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp llvm/lib/IR/Core.cpp llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp llvm/unittests/IR/IRBuilderTest.cpp polly/lib/CodeGen/RuntimeDebugBuilder.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 78b432474ba3b7..659b76dd7994b3 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -13649,7 +13649,7 @@ Value *CodeGenFunction::EmitBPFBuiltinExpr(unsigned BuiltinID, else InitValStr = std::to_string(InitVal.getZExtValue()); std::string EnumStr = Enumerator->getNameAsString() + ":" + InitValStr; - Value *EnumStrVal = Builder.CreateGlobalStringPtr(EnumStr); + Value *EnumStrVal = Builder.CreateGlobalString(EnumStr); ConstantInt *Flag = cast<ConstantInt>(EmitScalarExpr(E->getArg(1))); Value *FlagValue = ConstantInt::get(Int64Ty, Flag->getSExtValue()); diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 82caf65ac68d6b..b7f5b932c56b6f 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -1807,7 +1807,7 @@ ScalarExprEmitter::VisitSYCLUniqueStableNameExpr(SYCLUniqueStableNameExpr *E) { ASTContext &Context = CGF.getContext(); unsigned AddrSpace = Context.getTargetAddressSpace(CGF.CGM.GetGlobalConstantAddressSpace()); - llvm::Constant *GlobalConstStr = Builder.CreateGlobalStringPtr( + llvm::Constant *GlobalConstStr = Builder.CreateGlobalString( E->ComputeName(Context), "__usn_str", AddrSpace); llvm::Type *ExprTy = ConvertType(E->getType()); diff --git a/llvm/include/llvm-c/Core.h b/llvm/include/llvm-c/Core.h index 26d4ef424b2a1e..ec5c0e7dbbd655 100644 --- a/llvm/include/llvm-c/Core.h +++ b/llvm/include/llvm-c/Core.h @@ -4526,6 +4526,9 @@ LLVMValueRef LLVMBuildStructGEP2(LLVMBuilderRef B, LLVMTypeRef Ty, const char *Name); LLVMValueRef LLVMBuildGlobalString(LLVMBuilderRef B, const char *Str, const char *Name); +/** + * Deprecated: Use LLVMBuildGlobalString instead, which has identical behavior. + */ LLVMValueRef LLVMBuildGlobalStringPtr(LLVMBuilderRef B, const char *Str, const char *Name); LLVMBool LLVMGetVolatile(LLVMValueRef MemoryAccessInst); diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp index fca822a485cafe..1f23838b2de0ca 100644 --- a/llvm/lib/CodeGen/StackProtector.cpp +++ b/llvm/lib/CodeGen/StackProtector.cpp @@ -705,7 +705,7 @@ BasicBlock *CreateFailBB(Function *F, const Triple &Trip) { StackChkFail = M->getOrInsertFunction("__stack_smash_handler", Type::getVoidTy(Context), PointerType::getUnqual(Context)); - Args.push_back(B.CreateGlobalStringPtr(F->getName(), "SSH")); + Args.push_back(B.CreateGlobalString(F->getName(), "SSH")); } else { StackChkFail = M->getOrInsertFunction("__stack_chk_fail", Type::getVoidTy(Context)); diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp index 722587e23bfd33..a90770f6ea2eeb 100644 --- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp +++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp @@ -886,8 +886,8 @@ Constant *OpenMPIRBuilder::getOrCreateSrcLocStr(StringRef LocStr, GV.getInitializer() == Initializer) return SrcLocStr = ConstantExpr::getPointerCast(&GV, Int8Ptr); - SrcLocStr = Builder.CreateGlobalStringPtr(LocStr, /* Name */ "", - /* AddressSpace */ 0, &M); + SrcLocStr = Builder.CreateGlobalString(LocStr, /* Name */ "", + /* AddressSpace */ 0, &M); } return SrcLocStr; } diff --git a/llvm/lib/IR/Core.cpp b/llvm/lib/IR/Core.cpp index 8e8a374ffbbb6a..c1ca2c255aa587 100644 --- a/llvm/lib/IR/Core.cpp +++ b/llvm/lib/IR/Core.cpp @@ -4060,7 +4060,7 @@ LLVMValueRef LLVMBuildGlobalString(LLVMBuilderRef B, const char *Str, LLVMValueRef LLVMBuildGlobalStringPtr(LLVMBuilderRef B, const char *Str, const char *Name) { - return wrap(unwrap(B)->CreateGlobalStringPtr(Str, Name)); + return wrap(unwrap(B)->CreateGlobalString(Str, Name)); } LLVMBool LLVMGetVolatile(LLVMValueRef MemAccessInst) { diff --git a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp index 3c3cc2599aee2f..577647cac3f58c 100644 --- a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp @@ -1077,17 +1077,16 @@ void DFSanFunction::addReachesFunctionCallbacksIfEnabled(IRBuilder<> &IRB, if (dbgloc.get() == nullptr) { CILine = llvm::ConstantInt::get(I.getContext(), llvm::APInt(32, 0)); - FilePathPtr = IRB.CreateGlobalStringPtr( + FilePathPtr = IRB.CreateGlobalString( I.getFunction()->getParent()->getSourceFileName()); } else { CILine = llvm::ConstantInt::get(I.getContext(), llvm::APInt(32, dbgloc.getLine())); - FilePathPtr = - IRB.CreateGlobalStringPtr(dbgloc->getFilename()); + FilePathPtr = IRB.CreateGlobalString(dbgloc->getFilename()); } llvm::Value *FunctionNamePtr = - IRB.CreateGlobalStringPtr(I.getFunction()->getName()); + IRB.CreateGlobalString(I.getFunction()->getName()); CallInst *CB; std::vector<Value *> args; @@ -1293,7 +1292,7 @@ void DataFlowSanitizer::buildExternWeakCheckIfNeeded(IRBuilder<> &IRB, if (GlobalValue::isExternalWeakLinkage(F->getLinkage())) { std::vector<Value *> Args; Args.push_back(F); - Args.push_back(IRB.CreateGlobalStringPtr(F->getName())); + Args.push_back(IRB.CreateGlobalString(F->getName())); IRB.CreateCall(DFSanWrapperExternWeakNullFn, Args); } } @@ -1313,8 +1312,7 @@ DataFlowSanitizer::buildWrapperFunction(Function *F, StringRef NewFName, if (F->isVarArg()) { NewF->removeFnAttr("split-stack"); CallInst::Create(DFSanVarargWrapperFn, - IRBuilder<>(BB).CreateGlobalStringPtr(F->getName()), "", - BB); + IRBuilder<>(BB).CreateGlobalString(F->getName()), "", BB); new UnreachableInst(*Ctx, BB); } else { auto ArgIt = pointer_iterator<Argument *>(NewF->arg_begin()); @@ -3086,7 +3084,7 @@ bool DFSanVisitor::visitWrappedCallBase(Function &F, CallBase &CB) { case DataFlowSanitizer::WK_Warning: CB.setCalledFunction(&F); IRB.CreateCall(DFSF.DFS.DFSanUnimplementedFn, - IRB.CreateGlobalStringPtr(F.getName())); + IRB.CreateGlobalString(F.getName())); DFSF.DFS.buildExternWeakCheckIfNeeded(IRB, &F); DFSF.setShadow(&CB, DFSF.DFS.getZeroShadow(&CB)); DFSF.setOrigin(&CB, DFSF.DFS.ZeroOrigin); diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp index 694b2e6af718b7..a409f6150a71c1 100644 --- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -1126,7 +1126,7 @@ Function *GCOVProfiler::insertCounterWriteout( uint32_t CfgChecksum = FileChecksums.empty() ? 0 : FileChecksums[i]; auto *StartFileCallArgs = ConstantStruct::get( StartFileCallArgsTy, - {Builder.CreateGlobalStringPtr(FilenameGcda), + {Builder.CreateGlobalString(FilenameGcda), Builder.getInt32(endian::read32be(Options.Version)), Builder.getInt32(CfgChecksum)}); diff --git a/llvm/unittests/IR/IRBuilderTest.cpp b/llvm/unittests/IR/IRBuilderTest.cpp index 64e3b9c44cf8bb..d5239f21147cdb 100644 --- a/llvm/unittests/IR/IRBuilderTest.cpp +++ b/llvm/unittests/IR/IRBuilderTest.cpp @@ -1142,12 +1142,12 @@ TEST_F(IRBuilderTest, InsertExtractElement) { EXPECT_EQ(Elt2, X2); } -TEST_F(IRBuilderTest, CreateGlobalStringPtr) { +TEST_F(IRBuilderTest, CreateGlobalString) { IRBuilder<> Builder(BB); - auto String1a = Builder.CreateGlobalStringPtr("TestString", "String1a"); - auto String1b = Builder.CreateGlobalStringPtr("TestString", "String1b", 0); - auto String2 = Builder.CreateGlobalStringPtr("TestString", "String2", 1); + auto String1a = Builder.CreateGlobalString("TestString", "String1a"); + auto String1b = Builder.CreateGlobalString("TestString", "String1b", 0); + auto String2 = Builder.CreateGlobalString("TestString", "String2", 1); auto String3 = Builder.CreateGlobalString("TestString", "String3", 2); EXPECT_TRUE(String1a->getType()->getPointerAddressSpace() == 0); diff --git a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp index 8a29b0aaaf9c36..5355fe2f376394 100644 --- a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp +++ b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp @@ -23,7 +23,7 @@ llvm::Value *RuntimeDebugBuilder::getPrintableString(PollyIRBuilder &Builder, // because CPU backends typically ignore the address space. For constant // strings as returned by getPrintableString, the format string should instead // directly spell out the string. - return Builder.CreateGlobalStringPtr(Str, "", 4); + return Builder.CreateGlobalString(Str, "", 4); } Function *RuntimeDebugBuilder::getVPrintF(PollyIRBuilder &Builder) { @@ -131,7 +131,7 @@ Function *RuntimeDebugBuilder::getPrintF(PollyIRBuilder &Builder) { void RuntimeDebugBuilder::createPrintF(PollyIRBuilder &Builder, std::string Format, ArrayRef<Value *> Values) { - Value *FormatString = Builder.CreateGlobalStringPtr(Format); + Value *FormatString = Builder.CreateGlobalString(Format); std::vector<Value *> Arguments; Arguments.push_back(FormatString); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
