commit 93f760468e318c1cd391d6772f2a04749a67befd
author Rui Ueyama <ruiu@google.com> Sat Dec 28 10:09:21 2013 +0000
committer Rui Ueyama <ruiu@google.com> Sat Dec 28 10:09:21 2013 +0000
tree 59990e509d4441f49b53522976b2fdfcb41d9ef5
parent 30f287fde5b1e4d871726dccd0aad5913917f4f0

Simplify if ... return repetition.

llvm-svn: 198108

lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp

diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
index 2564329..d1db7cd 100644
--- a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
@@ -235,13 +235,8 @@
 // e.g. different export ordinals.
 static bool exportConflicts(const PECOFFLinkingContext::ExportDesc &a,
                             const PECOFFLinkingContext::ExportDesc &b) {
-  if (a.ordinal > 0 && b.ordinal > 0 && a.ordinal != b.ordinal)
-    return true;
-  if (a.noname != b.noname)
-    return true;
-  if (a.isData != b.isData)
-    return true;
-  return false;
+  return (a.ordinal > 0 && b.ordinal > 0 && a.ordinal != b.ordinal) ||
+         a.noname != b.noname || a.isData != b.isData;
 }
 
 void PECOFFLinkingContext::addDllExport(ExportDesc &desc) {