summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2014-04-01 13:56:35 +0000
committerAaron Ballman <aaron@aaronballman.com>2014-04-01 13:56:35 +0000
commit77d76519dc5242abb1c9a17cee3e2bbfe96f3e42 (patch)
tree35af16d7362dacb6d23729daa50a3ff1e4489364
parentc077472250ef27e514f5ad44f3b258a18a70f065 (diff)
downloadllvm-77d76519dc5242abb1c9a17cee3e2bbfe96f3e42.tar.gz
llvm-77d76519dc5242abb1c9a17cee3e2bbfe96f3e42.tar.bz2
llvm-77d76519dc5242abb1c9a17cee3e2bbfe96f3e42.tar.xz
Attempting to fix r205124, which had failed asserts when built with MSVC.
Suggestion from Yaron Keren. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205313 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index cd7714df25..5662f65f82 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -11038,7 +11038,7 @@ SDValue X86TargetLowering::LowerBRCOND(SDValue Op, SelectionDAG &DAG) const {
SDValue
X86TargetLowering::LowerDYNAMIC_STACKALLOC(SDValue Op,
SelectionDAG &DAG) const {
- assert((Subtarget->isTargetCygMing() || Subtarget->isTargetWindows() ||
+ assert((Subtarget->isOSWindows() ||
getTargetMachine().Options.EnableSegmentedStacks) &&
"This should be used only on Windows targets or when segmented stacks "
"are being used");