[llvm-branch-commits] [clang] [llvm] [ValueTracking] Add CharWidth argument to getConstantStringInfo (NFC) (PR #106541)
Sergei Barannikov via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sat Oct 26 17:57:34 PDT 2024
https://github.com/s-barannikov updated https://github.com/llvm/llvm-project/pull/106541
>From cdb7292f6ce3f4afc8bf9ac1e3e3942d23c8dce3 Mon Sep 17 00:00:00 2001
From: Sergei Barannikov <barannikov88 at gmail.com>
Date: Wed, 28 Aug 2024 23:51:13 +0300
Subject: [PATCH] [ValueTracking] Add CharWidth argument to
getConstantStringInfo (NFC)
The method assumes that host chars and target chars have the same width.
Add a CharWidth argument so that it can bail out if the requested char
width differs from the host char width.
Alternatively, the check could be done at call sites, but this is more
error-prone.
In the future, this method will be replaced with a different one that
allows host/target chars to have different widths. The prototype will
be the same except that StringRef is replaced with something that is
byte width agnostic. Adding CharWidth argument now reduces the future
diff.
---
clang/lib/CodeGen/CGBuiltin.cpp | 4 +-
llvm/include/llvm/Analysis/ValueTracking.h | 2 +-
llvm/lib/Analysis/ValueTracking.cpp | 7 +-
.../AMDGPU/AMDGPUPrintfRuntimeBinding.cpp | 4 +-
llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp | 2 +-
.../Target/SPIRV/SPIRVPrepareFunctions.cpp | 2 +-
.../WebAssembly/WebAssemblyAsmPrinter.cpp | 2 +-
.../AggressiveInstCombine.cpp | 12 +-
.../lib/Transforms/Utils/AMDGPUEmitPrintf.cpp | 4 +-
.../lib/Transforms/Utils/SimplifyLibCalls.cpp | 103 ++++++++++++------
10 files changed, 96 insertions(+), 46 deletions(-)
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index e2d03eff8ab4a0..0452d9a4e3803e 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -18585,7 +18585,7 @@ void CodeGenFunction::ProcessOrderScopeAMDGCN(Value *Order, Value *Scope,
// Some of the atomic builtins take the scope as a string name.
StringRef scp;
- if (llvm::getConstantStringInfo(Scope, scp)) {
+ if (llvm::getConstantStringInfo(Scope, scp, /*CharWidth=*/8)) {
SSID = getLLVMContext().getOrInsertSyncScopeID(scp);
return;
}
@@ -18972,7 +18972,7 @@ void CodeGenFunction::AddAMDGPUFenceAddressSpaceMMRA(llvm::Instruction *Inst,
for (unsigned K = 2; K < E->getNumArgs(); ++K) {
llvm::Value *V = EmitScalarExpr(E->getArg(K));
StringRef AS;
- if (llvm::getConstantStringInfo(V, AS)) {
+ if (llvm::getConstantStringInfo(V, AS, /*CharWidth=*/8)) {
MMRAs.push_back({Tag, AS});
// TODO: Delete the resulting unused constant?
continue;
diff --git a/llvm/include/llvm/Analysis/ValueTracking.h b/llvm/include/llvm/Analysis/ValueTracking.h
index 0c6ebf87b29232..76fd7bd4dfe66e 100644
--- a/llvm/include/llvm/Analysis/ValueTracking.h
+++ b/llvm/include/llvm/Analysis/ValueTracking.h
@@ -695,7 +695,7 @@ bool getConstantDataArrayInfo(const Value *V, ConstantDataArraySlice &Slice,
/// character by default. If TrimAtNul is set to false, then this returns any
/// trailing null characters as well as any other characters that come after
/// it.
-bool getConstantStringInfo(const Value *V, StringRef &Str,
+bool getConstantStringInfo(const Value *V, StringRef &Str, unsigned CharWidth,
bool TrimAtNul = true);
/// If we can compute the length of the string pointed to by the specified
diff --git a/llvm/lib/Analysis/ValueTracking.cpp b/llvm/lib/Analysis/ValueTracking.cpp
index 8921af71728690..afa67249afd304 100644
--- a/llvm/lib/Analysis/ValueTracking.cpp
+++ b/llvm/lib/Analysis/ValueTracking.cpp
@@ -6492,9 +6492,12 @@ bool llvm::getConstantDataArrayInfo(const Value *V,
/// return true. When TrimAtNul is set, Str will contain only the bytes up
/// to but not including the first nul. Return false on failure.
bool llvm::getConstantStringInfo(const Value *V, StringRef &Str,
- bool TrimAtNul) {
+ unsigned CharWidth, bool TrimAtNul) {
+ if (CharWidth != CHAR_BIT)
+ return false;
+
ConstantDataArraySlice Slice;
- if (!getConstantDataArrayInfo(V, Slice, 8))
+ if (!getConstantDataArrayInfo(V, Slice, CharWidth))
return false;
if (Slice.Array == nullptr) {
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
index a899805dc46b1a..0bbe5ea86d8d4e 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
@@ -127,7 +127,7 @@ static_assert(NonLiteralStr.size() == 3);
static StringRef getAsConstantStr(Value *V) {
StringRef S;
- if (!getConstantStringInfo(V, S))
+ if (!getConstantStringInfo(V, S, /*CharWidth=*/8))
S = NonLiteralStr;
return S;
@@ -161,7 +161,7 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
Value *Op = CI->getArgOperand(0);
StringRef FormatStr;
- if (!getConstantStringInfo(Op, FormatStr)) {
+ if (!getConstantStringInfo(Op, FormatStr, /*CharWidth=*/8)) {
Value *Stripped = Op->stripPointerCasts();
if (!isa<UndefValue>(Stripped) && !isa<ConstantPointerNull>(Stripped))
diagnoseInvalidFormatString(CI);
diff --git a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
index 8210e20ce5b10e..e54d5d79aa3c39 100644
--- a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
@@ -561,7 +561,7 @@ void SPIRVAsmPrinter::outputAnnotations(const Module &M) {
cast<GlobalVariable>(CS->getOperand(1)->stripPointerCasts());
StringRef AnnotationString;
- getConstantStringInfo(GV, AnnotationString);
+ getConstantStringInfo(GV, AnnotationString, /*CharWidth=*/8);
MCInst Inst;
Inst.setOpcode(SPIRV::OpDecorate);
Inst.addOperand(MCOperand::createReg(Reg));
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
index ecf9b6ddae1fc3..b00de20fc4f160 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
@@ -164,7 +164,7 @@ static std::string getAnnotation(Value *AnnoVal, Value *OptAnnoVal) {
std::string Anno;
if (auto *C = dyn_cast_or_null<Constant>(AnnoVal)) {
StringRef Str;
- if (getConstantStringInfo(C, Str))
+ if (getConstantStringInfo(C, Str, /*CharWidth=*/8))
Anno = Str;
}
// handle optional annotation parameter in a way that Khronos Translator do
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
index 14c0eaac17daaa..29f5ae3e8b961b 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
@@ -579,7 +579,7 @@ void WebAssemblyAsmPrinter::EmitFunctionAttributes(Module &M) {
// The second field is a pointer to a global annotation string.
auto *GV = cast<GlobalVariable>(CS->getOperand(1)->stripPointerCasts());
StringRef AnnotationString;
- getConstantStringInfo(GV, AnnotationString);
+ getConstantStringInfo(GV, AnnotationString, /*CharWidth=*/8);
auto *Sym = cast<MCSymbolWasm>(getSymbol(F));
CustomSections[AnnotationString].push_back(Sym);
}
diff --git a/llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp b/llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp
index b5b561797f75ab..24afbf3dbe8629 100644
--- a/llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp
+++ b/llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp
@@ -966,6 +966,8 @@ class StrNCmpInliner {
/// handled by the instcombine pass.
///
bool StrNCmpInliner::optimizeStrNCmp() {
+ unsigned CharWidth = DL.getByteWidth();
+
if (StrNCmpInlineThreshold < 2)
return false;
@@ -979,8 +981,10 @@ bool StrNCmpInliner::optimizeStrNCmp() {
return false;
StringRef Str1, Str2;
- bool HasStr1 = getConstantStringInfo(Str1P, Str1, /*TrimAtNul=*/false);
- bool HasStr2 = getConstantStringInfo(Str2P, Str2, /*TrimAtNul=*/false);
+ bool HasStr1 =
+ getConstantStringInfo(Str1P, Str1, CharWidth, /*TrimAtNul=*/false);
+ bool HasStr2 =
+ getConstantStringInfo(Str2P, Str2, CharWidth, /*TrimAtNul=*/false);
if (HasStr1 == HasStr2)
return false;
@@ -1110,12 +1114,14 @@ void StrNCmpInliner::inlineCompare(Value *LHS, StringRef RHS, uint64_t N,
/// Convert memchr with a small constant string into a switch
static bool foldMemChr(CallInst *Call, DomTreeUpdater *DTU,
const DataLayout &DL) {
+ unsigned CharWidth = DL.getByteWidth();
+
if (isa<Constant>(Call->getArgOperand(1)))
return false;
StringRef Str;
Value *Base = Call->getArgOperand(0);
- if (!getConstantStringInfo(Base, Str, /*TrimAtNul=*/false))
+ if (!getConstantStringInfo(Base, Str, CharWidth, /*TrimAtNul=*/false))
return false;
uint64_t N = Str.size();
diff --git a/llvm/lib/Transforms/Utils/AMDGPUEmitPrintf.cpp b/llvm/lib/Transforms/Utils/AMDGPUEmitPrintf.cpp
index a25632acbfcc3a..617f912b10ba60 100644
--- a/llvm/lib/Transforms/Utils/AMDGPUEmitPrintf.cpp
+++ b/llvm/lib/Transforms/Utils/AMDGPUEmitPrintf.cpp
@@ -250,7 +250,7 @@ static Value *callBufferedPrintfStart(
for (size_t i = 1; i < Args.size(); i++) {
if (SpecIsCString.test(i)) {
StringRef ArgStr;
- if (getConstantStringInfo(Args[i], ArgStr)) {
+ if (getConstantStringInfo(Args[i], ArgStr, /*CharWidth=*/8)) {
auto alignedLen = alignTo(ArgStr.size() + 1, 8);
StringContents.push_back(StringData(
ArgStr,
@@ -432,7 +432,7 @@ Value *llvm::emitAMDGPUPrintfCall(IRBuilder<> &Builder, ArrayRef<Value *> Args,
SparseBitVector<8> SpecIsCString;
StringRef FmtStr;
- if (getConstantStringInfo(Fmt, FmtStr))
+ if (getConstantStringInfo(Fmt, FmtStr, /*CharWidth=*/8))
locateCStrings(SpecIsCString, FmtStr);
if (IsBuffered) {
diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 79e91ad097cf00..6e56e46b1d0211 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -472,6 +472,7 @@ static Value* memChrToCharCompare(CallInst *CI, Value *NBytes,
}
Value *LibCallSimplifier::optimizeStrChr(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Value *SrcStr = CI->getArgOperand(0);
Value *CharVal = CI->getArgOperand(1);
annotateNonNullNoUndefBasedOnAccess(CI, 0);
@@ -514,7 +515,7 @@ Value *LibCallSimplifier::optimizeStrChr(CallInst *CI, IRBuilderBase &B) {
// Otherwise, the character is a constant, see if the first argument is
// a string literal. If so, we can constant fold.
StringRef Str;
- if (!getConstantStringInfo(SrcStr, Str)) {
+ if (!getConstantStringInfo(SrcStr, Str, CharWidth)) {
if (CharC->isZero()) // strchr(p, 0) -> p + strlen(p)
if (Value *StrLen = emitStrLen(SrcStr, B, DL, TLI))
return B.CreateInBoundsGEP(B.getInt8Ty(), SrcStr, StrLen, "strchr");
@@ -534,13 +535,14 @@ Value *LibCallSimplifier::optimizeStrChr(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrRChr(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Value *SrcStr = CI->getArgOperand(0);
Value *CharVal = CI->getArgOperand(1);
ConstantInt *CharC = dyn_cast<ConstantInt>(CharVal);
annotateNonNullNoUndefBasedOnAccess(CI, 0);
StringRef Str;
- if (!getConstantStringInfo(SrcStr, Str)) {
+ if (!getConstantStringInfo(SrcStr, Str, CharWidth)) {
// strrchr(s, 0) -> strchr(s, 0)
if (CharC && CharC->isZero())
return copyFlags(*CI, emitStrChr(SrcStr, '\0', B, TLI));
@@ -558,13 +560,15 @@ Value *LibCallSimplifier::optimizeStrRChr(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrCmp(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
Value *Str1P = CI->getArgOperand(0), *Str2P = CI->getArgOperand(1);
if (Str1P == Str2P) // strcmp(x,x) -> 0
return ConstantInt::get(CI->getType(), 0);
StringRef Str1, Str2;
- bool HasStr1 = getConstantStringInfo(Str1P, Str1);
- bool HasStr2 = getConstantStringInfo(Str2P, Str2);
+ bool HasStr1 = getConstantStringInfo(Str1P, Str1, CharWidth);
+ bool HasStr2 = getConstantStringInfo(Str2P, Str2, CharWidth);
// strcmp(x, y) -> cnst (if both x and y are constant strings)
if (HasStr1 && HasStr2)
@@ -623,6 +627,7 @@ static Value *optimizeMemCmpVarSize(CallInst *CI, Value *LHS, Value *RHS,
IRBuilderBase &B, const DataLayout &DL);
Value *LibCallSimplifier::optimizeStrNCmp(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Value *Str1P = CI->getArgOperand(0);
Value *Str2P = CI->getArgOperand(1);
Value *Size = CI->getArgOperand(2);
@@ -645,8 +650,8 @@ Value *LibCallSimplifier::optimizeStrNCmp(CallInst *CI, IRBuilderBase &B) {
return copyFlags(*CI, emitMemCmp(Str1P, Str2P, Size, B, DL, TLI));
StringRef Str1, Str2;
- bool HasStr1 = getConstantStringInfo(Str1P, Str1);
- bool HasStr2 = getConstantStringInfo(Str2P, Str2);
+ bool HasStr1 = getConstantStringInfo(Str1P, Str1, CharWidth);
+ bool HasStr2 = getConstantStringInfo(Str2P, Str2, CharWidth);
// strncmp(x, y) -> cnst (if both x and y are constant strings)
if (HasStr1 && HasStr2) {
@@ -764,6 +769,8 @@ Value *LibCallSimplifier::optimizeStpCpy(CallInst *CI, IRBuilderBase &B) {
// Optimize a call to size_t strlcpy(char*, const char*, size_t).
Value *LibCallSimplifier::optimizeStrLCpy(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
Value *Size = CI->getArgOperand(2);
if (isKnownNonZero(Size, DL))
// Like snprintf, the function stores into the destination only when
@@ -794,7 +801,7 @@ Value *LibCallSimplifier::optimizeStrLCpy(CallInst *CI, IRBuilderBase &B) {
// when it's not nul-terminated (as it's required to be) to avoid
// reading past its end.
StringRef Str;
- if (!getConstantStringInfo(Src, Str, /*TrimAtNul=*/false))
+ if (!getConstantStringInfo(Src, Str, CharWidth, /*TrimAtNul=*/false))
return nullptr;
uint64_t SrcLen = Str.find('\0');
@@ -844,6 +851,7 @@ Value *LibCallSimplifier::optimizeStrLCpy(CallInst *CI, IRBuilderBase &B) {
// otherwise.
Value *LibCallSimplifier::optimizeStringNCpy(CallInst *CI, bool RetEnd,
IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Function *Callee = CI->getCalledFunction();
Value *Dst = CI->getArgOperand(0);
Value *Src = CI->getArgOperand(1);
@@ -911,7 +919,7 @@ Value *LibCallSimplifier::optimizeStringNCpy(CallInst *CI, bool RetEnd,
// st{p,r}ncpy(D, "a", N) -> memcpy(D, "a\0\0\0", N) for N <= 128.
StringRef Str;
- if (!getConstantStringInfo(Src, Str))
+ if (!getConstantStringInfo(Src, Str, CharWidth))
return nullptr;
std::string SrcStr = Str.str();
// Create a bigger, nul-padded array with the same length, SrcLen,
@@ -1080,9 +1088,11 @@ Value *LibCallSimplifier::optimizeWcslen(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrPBrk(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
StringRef S1, S2;
- bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1);
- bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2);
+ bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1, CharWidth);
+ bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2, CharWidth);
// strpbrk(s, "") -> nullptr
// strpbrk("", s) -> nullptr
@@ -1118,9 +1128,11 @@ Value *LibCallSimplifier::optimizeStrTo(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrSpn(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
StringRef S1, S2;
- bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1);
- bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2);
+ bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1, CharWidth);
+ bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2, CharWidth);
// strspn(s, "") -> 0
// strspn("", s) -> 0
@@ -1139,9 +1151,11 @@ Value *LibCallSimplifier::optimizeStrSpn(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrCSpn(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
StringRef S1, S2;
- bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1);
- bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2);
+ bool HasS1 = getConstantStringInfo(CI->getArgOperand(0), S1, CharWidth);
+ bool HasS2 = getConstantStringInfo(CI->getArgOperand(1), S2, CharWidth);
// strcspn("", s) -> 0
if (HasS1 && S1.empty())
@@ -1163,6 +1177,8 @@ Value *LibCallSimplifier::optimizeStrCSpn(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeStrStr(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
// fold strstr(x, x) -> x.
if (CI->getArgOperand(0) == CI->getArgOperand(1))
return CI->getArgOperand(0);
@@ -1188,8 +1204,10 @@ Value *LibCallSimplifier::optimizeStrStr(CallInst *CI, IRBuilderBase &B) {
// See if either input string is a constant string.
StringRef SearchStr, ToFindStr;
- bool HasStr1 = getConstantStringInfo(CI->getArgOperand(0), SearchStr);
- bool HasStr2 = getConstantStringInfo(CI->getArgOperand(1), ToFindStr);
+ bool HasStr1 =
+ getConstantStringInfo(CI->getArgOperand(0), SearchStr, CharWidth);
+ bool HasStr2 =
+ getConstantStringInfo(CI->getArgOperand(1), ToFindStr, CharWidth);
// fold strstr(x, "") -> x.
if (HasStr2 && ToFindStr.empty())
@@ -1217,6 +1235,8 @@ Value *LibCallSimplifier::optimizeStrStr(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeMemRChr(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
Value *SrcStr = CI->getArgOperand(0);
Value *Size = CI->getArgOperand(2);
annotateNonNullAndDereferenceable(CI, 0, Size, DL);
@@ -1241,7 +1261,7 @@ Value *LibCallSimplifier::optimizeMemRChr(CallInst *CI, IRBuilderBase &B) {
}
StringRef Str;
- if (!getConstantStringInfo(SrcStr, Str, /*TrimAtNul=*/false))
+ if (!getConstantStringInfo(SrcStr, Str, CharWidth, /*TrimAtNul=*/false))
return nullptr;
if (Str.size() == 0)
@@ -1305,6 +1325,7 @@ Value *LibCallSimplifier::optimizeMemRChr(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeMemChr(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Value *SrcStr = CI->getArgOperand(0);
Value *Size = CI->getArgOperand(2);
@@ -1336,7 +1357,7 @@ Value *LibCallSimplifier::optimizeMemChr(CallInst *CI, IRBuilderBase &B) {
}
StringRef Str;
- if (!getConstantStringInfo(SrcStr, Str, /*TrimAtNul=*/false))
+ if (!getConstantStringInfo(SrcStr, Str, CharWidth, /*TrimAtNul=*/false))
return nullptr;
if (CharC) {
@@ -1503,12 +1524,14 @@ Value *LibCallSimplifier::optimizeMemChr(CallInst *CI, IRBuilderBase &B) {
static Value *optimizeMemCmpVarSize(CallInst *CI, Value *LHS, Value *RHS,
Value *Size, bool StrNCmp,
IRBuilderBase &B, const DataLayout &DL) {
+ unsigned CharWidth = DL.getByteWidth();
+
if (LHS == RHS) // memcmp(s,s,x) -> 0
return Constant::getNullValue(CI->getType());
StringRef LStr, RStr;
- if (!getConstantStringInfo(LHS, LStr, /*TrimAtNul=*/false) ||
- !getConstantStringInfo(RHS, RStr, /*TrimAtNul=*/false))
+ if (!getConstantStringInfo(LHS, LStr, CharWidth, /*TrimAtNul=*/false) ||
+ !getConstantStringInfo(RHS, RStr, CharWidth, /*TrimAtNul=*/false))
return nullptr;
// If the contents of both constant arrays are known, fold a call to
@@ -1644,6 +1667,7 @@ Value *LibCallSimplifier::optimizeMemCpy(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizeMemCCpy(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
Value *Dst = CI->getArgOperand(0);
Value *Src = CI->getArgOperand(1);
ConstantInt *StopChar = dyn_cast<ConstantInt>(CI->getArgOperand(2));
@@ -1655,7 +1679,7 @@ Value *LibCallSimplifier::optimizeMemCCpy(CallInst *CI, IRBuilderBase &B) {
if (N) {
if (N->isNullValue())
return Constant::getNullValue(CI->getType());
- if (!getConstantStringInfo(Src, SrcStr, /*TrimAtNul=*/false) ||
+ if (!getConstantStringInfo(Src, SrcStr, CharWidth, /*TrimAtNul=*/false) ||
// TODO: Handle zeroinitializer.
!StopChar)
return nullptr;
@@ -3223,10 +3247,12 @@ Value *LibCallSimplifier::optimizeToAscii(CallInst *CI, IRBuilderBase &B) {
// Fold calls to atoi, atol, and atoll.
Value *LibCallSimplifier::optimizeAtoi(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
CI->addParamAttr(0, Attribute::NoCapture);
StringRef Str;
- if (!getConstantStringInfo(CI->getArgOperand(0), Str))
+ if (!getConstantStringInfo(CI->getArgOperand(0), Str, CharWidth))
return nullptr;
return convertStrToInt(CI, Str, nullptr, 10, /*AsSigned=*/true, B);
@@ -3235,6 +3261,8 @@ Value *LibCallSimplifier::optimizeAtoi(CallInst *CI, IRBuilderBase &B) {
// Fold calls to strtol, strtoll, strtoul, and strtoull.
Value *LibCallSimplifier::optimizeStrToInt(CallInst *CI, IRBuilderBase &B,
bool AsSigned) {
+ unsigned CharWidth = DL.getByteWidth();
+
Value *EndPtr = CI->getArgOperand(1);
if (isa<ConstantPointerNull>(EndPtr)) {
// With a null EndPtr, this function won't capture the main argument.
@@ -3245,7 +3273,7 @@ Value *LibCallSimplifier::optimizeStrToInt(CallInst *CI, IRBuilderBase &B,
return nullptr;
StringRef Str;
- if (!getConstantStringInfo(CI->getArgOperand(0), Str))
+ if (!getConstantStringInfo(CI->getArgOperand(0), Str, CharWidth))
return nullptr;
if (ConstantInt *CInt = dyn_cast<ConstantInt>(CI->getArgOperand(2))) {
@@ -3302,9 +3330,11 @@ static bool isReportingError(Function *Callee, CallInst *CI, int StreamArg) {
}
Value *LibCallSimplifier::optimizePrintFString(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
// Check for a fixed format string.
StringRef FormatStr;
- if (!getConstantStringInfo(CI->getArgOperand(0), FormatStr))
+ if (!getConstantStringInfo(CI->getArgOperand(0), FormatStr, CharWidth))
return nullptr;
// Empty format string -> noop.
@@ -3330,7 +3360,7 @@ Value *LibCallSimplifier::optimizePrintFString(CallInst *CI, IRBuilderBase &B) {
// Try to remove call or emit putchar/puts.
if (FormatStr == "%s" && CI->arg_size() > 1) {
StringRef OperandStr;
- if (!getConstantStringInfo(CI->getOperand(1), OperandStr))
+ if (!getConstantStringInfo(CI->getOperand(1), OperandStr, CharWidth))
return nullptr;
// printf("%s", "") --> NOP
if (OperandStr.empty())
@@ -3419,9 +3449,11 @@ Value *LibCallSimplifier::optimizePrintF(CallInst *CI, IRBuilderBase &B) {
Value *LibCallSimplifier::optimizeSPrintFString(CallInst *CI,
IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
// Check for a fixed format string.
StringRef FormatStr;
- if (!getConstantStringInfo(CI->getArgOperand(1), FormatStr))
+ if (!getConstantStringInfo(CI->getArgOperand(1), FormatStr, CharWidth))
return nullptr;
// If we just have a format string (nothing else crazy) transform it.
@@ -3594,6 +3626,8 @@ Value *LibCallSimplifier::emitSnPrintfMemCpy(CallInst *CI, Value *StrArg,
Value *LibCallSimplifier::optimizeSnPrintFString(CallInst *CI,
IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
// Check for size
ConstantInt *Size = dyn_cast<ConstantInt>(CI->getArgOperand(1));
if (!Size)
@@ -3611,7 +3645,7 @@ Value *LibCallSimplifier::optimizeSnPrintFString(CallInst *CI,
// Check for a fixed format string.
StringRef FormatStr;
- if (!getConstantStringInfo(FmtArg, FormatStr))
+ if (!getConstantStringInfo(FmtArg, FormatStr, CharWidth))
return nullptr;
// If we just have a format string (nothing else crazy) transform it.
@@ -3656,7 +3690,7 @@ Value *LibCallSimplifier::optimizeSnPrintFString(CallInst *CI,
Value *StrArg = CI->getArgOperand(3);
// snprintf(dest, size, "%s", str) to llvm.memcpy(dest, str, len+1, 1)
StringRef Str;
- if (!getConstantStringInfo(StrArg, Str))
+ if (!getConstantStringInfo(StrArg, Str, CharWidth))
return nullptr;
return emitSnPrintfMemCpy(CI, StrArg, Str, N, B);
@@ -3674,11 +3708,13 @@ Value *LibCallSimplifier::optimizeSnPrintF(CallInst *CI, IRBuilderBase &B) {
Value *LibCallSimplifier::optimizeFPrintFString(CallInst *CI,
IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
optimizeErrorReporting(CI, B, 0);
// All the optimizations depend on the format string.
StringRef FormatStr;
- if (!getConstantStringInfo(CI->getArgOperand(1), FormatStr))
+ if (!getConstantStringInfo(CI->getArgOperand(1), FormatStr, CharWidth))
return nullptr;
// Do not do any of the following transformations if the fprintf return
@@ -3821,6 +3857,8 @@ Value *LibCallSimplifier::optimizeFPuts(CallInst *CI, IRBuilderBase &B) {
}
Value *LibCallSimplifier::optimizePuts(CallInst *CI, IRBuilderBase &B) {
+ unsigned CharWidth = DL.getByteWidth();
+
annotateNonNullNoUndefBasedOnAccess(CI, 0);
if (!CI->use_empty())
return nullptr;
@@ -3828,7 +3866,8 @@ Value *LibCallSimplifier::optimizePuts(CallInst *CI, IRBuilderBase &B) {
// Check for a constant string.
// puts("") -> putchar('\n')
StringRef Str;
- if (getConstantStringInfo(CI->getArgOperand(0), Str) && Str.empty()) {
+ if (getConstantStringInfo(CI->getArgOperand(0), Str, CharWidth) &&
+ Str.empty()) {
// putchar takes an argument of the same type as puts returns, i.e.,
// int, which need not be 32 bits wide.
Type *IntTy = CI->getType();
@@ -3974,8 +4013,10 @@ Value *LibCallSimplifier::optimizeStringMemoryLibCall(CallInst *CI,
/// Constant folding nan/nanf/nanl.
static Value *optimizeNaN(CallInst *CI) {
+ unsigned CharWidth = CI->getDataLayout().getByteWidth();
+
StringRef CharSeq;
- if (!getConstantStringInfo(CI->getArgOperand(0), CharSeq))
+ if (!getConstantStringInfo(CI->getArgOperand(0), CharSeq, CharWidth))
return nullptr;
APInt Fill;
More information about the llvm-branch-commits
mailing list