summaryrefslogtreecommitdiffstats
path: root/gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2017-01-24 08:32:59 +0000
committerpatrick <patrick@openbsd.org>2017-01-24 08:32:59 +0000
commit53d771aafdbe5b919f264f53cba3788e2c4cffd2 (patch)
tree7eca39498be0ff1e3a6daf583cd9ca5886bb2636 /gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp
parentIn preparation of compiling our kernels with -ffreestanding, explicitly map (diff)
downloadwireguard-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/CodeGen/MachineTraceMetrics.cpp')
-rw-r--r--gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp b/gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp
index 86332c8a93a..ef7e525e816 100644
--- a/gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp
+++ b/gnu/llvm/lib/CodeGen/MachineTraceMetrics.cpp
@@ -430,16 +430,17 @@ public:
po_iterator_storage(LoopBounds &lb) : LB(lb) {}
void finishPostorder(const MachineBasicBlock*) {}
- bool insertEdge(const MachineBasicBlock *From, const MachineBasicBlock *To) {
+ bool insertEdge(Optional<const MachineBasicBlock *> From,
+ const MachineBasicBlock *To) {
// Skip already visited To blocks.
MachineTraceMetrics::TraceBlockInfo &TBI = LB.Blocks[To->getNumber()];
if (LB.Downward ? TBI.hasValidHeight() : TBI.hasValidDepth())
return false;
// From is null once when To is the trace center block.
if (From) {
- if (const MachineLoop *FromLoop = LB.Loops->getLoopFor(From)) {
+ if (const MachineLoop *FromLoop = LB.Loops->getLoopFor(*From)) {
// Don't follow backedges, don't leave FromLoop when going upwards.
- if ((LB.Downward ? To : From) == FromLoop->getHeader())
+ if ((LB.Downward ? To : *From) == FromLoop->getHeader())
return false;
// Don't leave FromLoop.
if (isExitingLoop(FromLoop, LB.Loops->getLoopFor(To)))