diff options
| author |   patrick <patrick@openbsd.org> | 2017-01-24 08:32:59 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2017-01-24 08:32:59 +0000 |
| commit | 53d771aafdbe5b919f264f53cba3788e2c4cffd2 (patch) | |
| tree | 7eca39498be0ff1e3a6daf583cd9ca5886bb2636 /gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp | |
| parent | In preparation of compiling our kernels with -ffreestanding, explicitly map (diff) | |
| download | wireguard-openbsd-53d771aafdbe5b919f264f53cba3788e2c4cffd2.tar.xz wireguard-openbsd-53d771aafdbe5b919f264f53cba3788e2c4cffd2.zip | |
Import LLVM 4.0.0 rc1 including clang and lld to help the current
development effort on OpenBSD/arm64.
Diffstat (limited to 'gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp')
| -rw-r--r-- | gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp b/gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp index dfe51a4ce44..389f1c595aa 100644 --- a/gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp +++ b/gnu/llvm/lib/Transforms/Scalar/LoadCombine.cpp @@ -44,9 +44,6 @@ struct PointerOffsetPair { }; struct LoadPOPPair { - LoadPOPPair() = default; - LoadPOPPair(LoadInst *L, PointerOffsetPair P, unsigned O) - : Load(L), POP(P), InsertOrder(O) {} LoadInst *Load; PointerOffsetPair POP; /// \brief The new load needs to be created before the first load in IR order. @@ -71,7 +68,7 @@ public: AU.addPreserved<GlobalsAAWrapperPass>(); } - const char *getPassName() const override { return LDCOMBINE_NAME; } + StringRef getPassName() const override { return LDCOMBINE_NAME; } static char ID; typedef IRBuilder<TargetFolder> BuilderTy; @@ -264,7 +261,7 @@ bool LoadCombine::runOnBasicBlock(BasicBlock &BB) { auto POP = getPointerOffsetPair(*LI); if (!POP.Pointer) continue; - LoadMap[POP.Pointer].push_back(LoadPOPPair(LI, POP, Index++)); + LoadMap[POP.Pointer].push_back({LI, std::move(POP), Index++}); AST.add(LI); } if (combineLoads(LoadMap)) |