Skip to content

[GlobalOpt] Remove Function* argument from tryWidenGlobalArrayAndDests. NFC #127848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2025
Merged

[GlobalOpt] Remove Function* argument from tryWidenGlobalArrayAndDests. NFC #127848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions llvm/lib/Transforms/IPO/GlobalOpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,7 +2064,7 @@ static bool destArrayCanBeWidened(CallInst *CI) {
return true;
}

static GlobalVariable *widenGlobalVariable(GlobalVariable *OldVar, Function *F,
static GlobalVariable *widenGlobalVariable(GlobalVariable *OldVar,
unsigned NumBytesToPad,
unsigned NumBytesToCopy) {
if (!OldVar->hasInitializer())
Expand All @@ -2083,10 +2083,10 @@ static GlobalVariable *widenGlobalVariable(GlobalVariable *OldVar, Function *F,
StrData.push_back('\0');
auto Arr = ArrayRef(StrData.data(), NumBytesToCopy + NumBytesToPad);
// Create new padded version of global variable.
Constant *SourceReplace = ConstantDataArray::get(F->getContext(), Arr);
Constant *SourceReplace = ConstantDataArray::get(OldVar->getContext(), Arr);
GlobalVariable *NewGV = new GlobalVariable(
*(F->getParent()), SourceReplace->getType(), true, OldVar->getLinkage(),
SourceReplace, SourceReplace->getName());
*(OldVar->getParent()), SourceReplace->getType(), true,
OldVar->getLinkage(), SourceReplace, SourceReplace->getName());
// Copy any other attributes from original global variable
// e.g. unamed_addr
NewGV->copyAttributesFrom(OldVar);
Expand Down Expand Up @@ -2114,13 +2114,13 @@ static void widenDestArray(CallInst *CI, const unsigned NumBytesToPad,
}
}

static bool tryWidenGlobalArrayAndDests(Function *F, GlobalVariable *SourceVar,
static bool tryWidenGlobalArrayAndDests(GlobalVariable *SourceVar,
const unsigned NumBytesToPad,
const unsigned NumBytesToCopy,
ConstantInt *BytesToCopyOp,
ConstantDataArray *SourceDataArray) {
auto *NewSourceGV =
widenGlobalVariable(SourceVar, F, NumBytesToPad, NumBytesToCopy);
widenGlobalVariable(SourceVar, NumBytesToPad, NumBytesToCopy);
if (!NewSourceGV)
return false;

Expand Down Expand Up @@ -2158,8 +2158,6 @@ static bool tryWidenGlobalArraysUsedByMemcpy(
if (!callInstIsMemcpy(CI) || !destArrayCanBeWidened(CI))
continue;

Function *F = CI->getCalledFunction();

auto *BytesToCopyOp = dyn_cast<ConstantInt>(CI->getArgOperand(2));
if (!BytesToCopyOp)
continue;
Expand Down Expand Up @@ -2191,7 +2189,7 @@ static bool tryWidenGlobalArraysUsedByMemcpy(
.getNumBytesToPadGlobalArray(NumBytesToCopy,
SourceDataArray->getType());
if (NumBytesToPad) {
return tryWidenGlobalArrayAndDests(F, GV, NumBytesToPad, NumBytesToCopy,
return tryWidenGlobalArrayAndDests(GV, NumBytesToPad, NumBytesToCopy,
BytesToCopyOp, SourceDataArray);
}
}
Expand Down
Loading