From 4e7ded834f113c38a208e06e521b0e58047ee0f8 Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Wed, 26 Aug 2015 20:46:52 +0000
Subject: 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
---
 llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'llvm/lib/CodeGen')

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; }
-- 
cgit v1.2.3