aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2010-04-02 01:31:24 +0000
committerChandler Carruth <chandlerc@gmail.com>2010-04-02 01:31:24 +0000
commitae1d41c8ae243329c6f0dfcd6abd33a7f89bfa7b (patch)
tree0b22531f2ed77c92c6dc0f306955b6b8add343ca /lib
parent1e4ac4dfd9b97cb9bbca828029eb190bb6e8e5a1 (diff)
downloadexternal_llvm-ae1d41c8ae243329c6f0dfcd6abd33a7f89bfa7b.tar.gz
external_llvm-ae1d41c8ae243329c6f0dfcd6abd33a7f89bfa7b.tar.bz2
external_llvm-ae1d41c8ae243329c6f0dfcd6abd33a7f89bfa7b.zip
Disambiguate conditional expression for newer GCCs.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100167 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 834ef6c423..596ac2fd39 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -1088,8 +1088,8 @@ X86TargetLowering::getOptimalMemOpType(uint64_t Size,
if (!F->hasFnAttr(Attribute::NoImplicitFloat)) {
if (Size >= 16 &&
(Subtarget->isUnalignedMemAccessFast() ||
- (DstAlign == 0 || DstAlign >= 16) &&
- (SrcAlign == 0 || SrcAlign >= 16)) &&
+ ((DstAlign == 0 || DstAlign >= 16) &&
+ (SrcAlign == 0 || SrcAlign >= 16))) &&
Subtarget->getStackAlignment() >= 16) {
if (Subtarget->hasSSE2())
return MVT::v4i32;