From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 30 May 2015 11:44:02 +0000 (+0100)
Subject: stl_algobase.h (__equal<true>::equal): Check length instead of checking for null... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12fc64ac3a49bcd0bab8f18fbff08f58992d3942;p=gcc.git

stl_algobase.h (__equal<true>::equal): Check length instead of checking for null pointers.

	* include/bits/stl_algobase.h (__equal<true>::equal): Check length
	instead of checking for null pointers.
	(__lexicographical_compare<true>::__lc): Only check shorter length.

From-SVN: r223886
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c7b3b2d5ff4..19a4c14eaca 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/stl_algobase.h (__equal<true>::equal): Check length
+	instead of checking for null pointers.
+	(__lexicographical_compare<true>::__lc): Only check shorter length.
+
 2015-05-29  François Dumont  fdumont@gcc.gnu.org>
 
 	* include/debug/debug.h (_GLIBCXX_DEBUG_ASSERT,
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index db065e2accd..12eb7ec61f8 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -812,11 +812,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
         static bool
         equal(const _Tp* __first1, const _Tp* __last1, const _Tp* __first2)
         {
-	  if (__first1 == 0 || __first2 == 0)
-	    return __first1 == __last1;
-
-	  return !__builtin_memcmp(__first1, __first2, sizeof(_Tp)
-				   * (__last1 - __first1));
+	  if (const size_t __len = (__last1 - __first1))
+	    return !__builtin_memcmp(__first1, __first2, sizeof(_Tp) * __len);
+	  return true;
 	}
     };
 
@@ -920,14 +918,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	{
 	  const size_t __len1 = __last1 - __first1;
 	  const size_t __len2 = __last2 - __first2;
-	  if (__len1 && __len2)
-	    {
-	      if (int __result = __builtin_memcmp(__first1, __first2,
-						  std::min(__len1, __len2)))
-		{
-		  return __result < 0;
-		}
-	    }
+	  if (const size_t __len = std::min(__len1, __len2))
+	    if (int __result = __builtin_memcmp(__first1, __first2, __len))
+	      return __result < 0;
 	  return __len1 < __len2;
 	}
     };