This is an archive of the discontinued LLVM Phabricator instance.

Differential D22140

Move setName after accessing Name.
ClosedPublic

Authored by ioeric on Jul 8 2016, 8:57 AM.

Details

Reviewers
bkramer
Commits
rG6ee4e81a326f: Make a std::string copy of StringRef Name so that it remains valid when the…
rL274861: Make a std::string copy of StringRef Name so that it remains valid when the…
Summary

lib/IR/AutoUpgrade.cpp:348 and lib/IR/AutoUpgrade.cpp:350 upset sanitizer.

Diff Detail

Event Timeline

ioeric updated this revision to Diff 63236.Jul 8 2016, 8:57 AM
ioeric retitled this revision from to Make a std::string copy of StringRef Name so that it remains valid when the original Name is overridden..
ioeric updated this object.
ioeric added a reviewer: bkramer.
ioeric added a subscriber: llvm-commits.
bkramer added inline comments.Jul 8 2016, 9:04 AM
lib/IR/AutoUpgrade.cpp
347–348

Can we just move the setName call below the accesses to Name? I think that would be simpler and avoids the string copy.

ioeric updated this revision to Diff 63243.Jul 8 2016, 9:13 AM
  • Move setName after accessing Name
ioeric retitled this revision from Make a std::string copy of StringRef Name so that it remains valid when the original Name is overridden. to Move setName after accessing Name..Jul 8 2016, 9:13 AM
Closed by commit rL274861: Make a std::string copy of StringRef Name so that it remains valid when the… (authored by ioeric). · Explain WhyJul 8 2016, 9:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
IR/
2 lines

Diff 63243

lib/IR/AutoUpgrade.cpp

Show First 20 Lines • Show All 338 Lines • ▼ Show 20 Lines case 'x': {
if (IsX86 && Name.startswith("xop.vfrcz.sd") && F->arg_size() == 2) { if (IsX86 && Name.startswith("xop.vfrcz.sd") && F->arg_size() == 2) {
F->setName(Name + ".old"); F->setName(Name + ".old");
NewFn = Intrinsic::getDeclaration(F->getParent(), NewFn = Intrinsic::getDeclaration(F->getParent(),
Intrinsic::x86_xop_vfrcz_sd); Intrinsic::x86_xop_vfrcz_sd);
return true; return true;
} }
if (IsX86 && (Name.startswith("avx512.mask.pslli.") || if (IsX86 && (Name.startswith("avx512.mask.pslli.") ||
Name.startswith("avx512.mask.psrai.") || Name.startswith("avx512.mask.psrai.") ||
Name.startswith("avx512.mask.psrli."))) { Name.startswith("avx512.mask.psrli."))) {
F->setName("llvm.x86." + Name + ".old");
Intrinsic::ID ShiftID; Intrinsic::ID ShiftID;
bkramerUnsubmitted
Not Done
ReplyInline Actions

Can we just move the setName call below the accesses to Name? I think that would be simpler and avoids the string copy.

bkramer: Can we just move the setName call below the accesses to Name? I think that would be simpler and…
if (Name.slice(12, 16) == "psll") if (Name.slice(12, 16) == "psll")
ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psll_di_512 ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psll_di_512
: Intrinsic::x86_avx512_mask_psll_qi_512; : Intrinsic::x86_avx512_mask_psll_qi_512;
else if (Name.slice(12, 16) == "psra") else if (Name.slice(12, 16) == "psra")
ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psra_di_512 ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psra_di_512
: Intrinsic::x86_avx512_mask_psra_qi_512; : Intrinsic::x86_avx512_mask_psra_qi_512;
else else
ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psrl_di_512 ShiftID = Name[18] == 'd' ? Intrinsic::x86_avx512_mask_psrl_di_512
: Intrinsic::x86_avx512_mask_psrl_qi_512; : Intrinsic::x86_avx512_mask_psrl_qi_512;
F->setName("llvm.x86." + Name + ".old");
NewFn = Intrinsic::getDeclaration(F->getParent(), ShiftID); NewFn = Intrinsic::getDeclaration(F->getParent(), ShiftID);
return true; return true;
} }
// Fix the FMA4 intrinsics to remove the 4 // Fix the FMA4 intrinsics to remove the 4
if (IsX86 && Name.startswith("fma4.")) { if (IsX86 && Name.startswith("fma4.")) {
F->setName("llvm.x86.fma" + Name.substr(5)); F->setName("llvm.x86.fma" + Name.substr(5));
NewFn = F; NewFn = F;
return true; return true;
▲ Show 20 Lines • Show All 1,154 Lines • Show Last 20 Lines