commit f2cee5cbdaf6fc017ae35cc8ecabc3b607a5f7e4
author Benjamin Kramer <benny.kra@googlemail.com> Fri Sep 30 20:32:22 2011 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Fri Sep 30 20:32:22 2011 +0000
tree e218c2519736e45044c28fdb2ad420c43108e4f0
parent da79da2a8748e4d58eeedd1b7f39bf4fb8a86d10

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__.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140877 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/TargetAttributesSema.cpp

diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp
index 3a065ce..aa0bc08 100644
--- a/lib/Sema/TargetAttributesSema.cpp
+++ b/lib/Sema/TargetAttributesSema.cpp
@@ -249,8 +249,8 @@
         }
       }
       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;
       }