[cfe-commits] r140877 - /cfe/trunk/lib/Sema/TargetAttributesSema.cpp

[Benjamin Kramer]

Author: d0k
Date: Fri Sep 30 15:32:22 2011
New Revision: 140877

URL: http://llvm.org/viewvc/llvm-project?rev=140877&view=rev
Log:
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__.

Modified:
    cfe/trunk/lib/Sema/TargetAttributesSema.cpp

Modified: cfe/trunk/lib/Sema/TargetAttributesSema.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TargetAttributesSema.cpp?rev=140877&r1=140876&r2=140877&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/TargetAttributesSema.cpp (original)
+++ cfe/trunk/lib/Sema/TargetAttributesSema.cpp Fri Sep 30 15:32:22 2011
@@ -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;
       }