summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2011-09-30 20:32:22 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2011-09-30 20:32:22 +0000
commit7827da0e7594ada454bc9ab0c71a3838103768ce (patch)
tree8f14850a5996607cf5696d46eecb28f44decf4d7
parent1c99b57b595c8fff6500f5e290dea8f27d436af8 (diff)
downloadbcm5719-llvm-7827da0e7594ada454bc9ab0c71a3838103768ce.tar.gz
bcm5719-llvm-7827da0e7594ada454bc9ab0c71a3838103768ce.zip
Fix compiler warning about && in ||.
This time the warning found an actual bug, we don't want to handle force_align_arg_pointer differently than __force_align_arg_pointer__. llvm-svn: 140877
-rw-r--r--clang/lib/Sema/TargetAttributesSema.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/TargetAttributesSema.cpp b/clang/lib/Sema/TargetAttributesSema.cpp
index 3a065cead50..aa0bc08ef7f 100644
--- a/clang/lib/Sema/TargetAttributesSema.cpp
+++ b/clang/lib/Sema/TargetAttributesSema.cpp
@@ -249,8 +249,8 @@ namespace {
}
}
if (Triple.getArch() != llvm::Triple::x86_64 &&
- Attr.getName()->getName() == "force_align_arg_pointer" ||
- Attr.getName()->getName() == "__force_align_arg_pointer__") {
+ (Attr.getName()->getName() == "force_align_arg_pointer" ||
+ Attr.getName()->getName() == "__force_align_arg_pointer__")) {
HandleX86ForceAlignArgPointerAttr(D, Attr, S);
return true;
}
OpenPOWER on IntegriCloud