summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2015-08-26 20:46:52 +0000
committerMatthias Braun <matze@braunis.de>2015-08-26 20:46:52 +0000
commit4e7ded834f113c38a208e06e521b0e58047ee0f8 (patch)
tree3fc3cd5767a2261d2b50f9a51a83aa5c005e7217 /llvm/lib
parent4816b18d863f351542fa5564ac4d0068985d7bff (diff)
downloadbcm5719-llvm-4e7ded834f113c38a208e06e521b0e58047ee0f8.tar.gz
bcm5719-llvm-4e7ded834f113c38a208e06e521b0e58047ee0f8.zip
SelectionDAGBuilder: Fix SPDescriptor not resetting GuardReg
This was causing problems when some functions use a GuardReg and some don't as can happen when mixing SelectionDAG and FastISel generated functions. llvm-svn: 246075
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
index 40f476c355e..854e6d0f170 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
@@ -516,6 +516,7 @@ private:
void resetPerFunctionState() {
FailureMBB = nullptr;
Guard = nullptr;
+ GuardReg = 0;
}
MachineBasicBlock *getParentMBB() { return ParentMBB; }
OpenPOWER on IntegriCloud