Fix __gnu_cxx::_Pointer_adapter for long long arithmetic

Backport from mainline
2018-08-30  Jonathan Wakely  <jwakely@redhat.com>

	* include/ext/pointer.h (_Pointer_adapter): Define operators for
	pointer arithmetic using long long offsets.
	* testsuite/ext/ext_pointer/1.cc: Test pointer arithmetic using
	long long values.

From-SVN: r265094

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e4298de17bf6bc4cc5ee6589a767407e0ebc77ba..baa299050691dc32ba759066664c9af18791e825 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2018-10-12  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline
+       2018-08-30  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/ext/pointer.h (_Pointer_adapter): Define operators for
+       pointer arithmetic using long long offsets.
+       * testsuite/ext/ext_pointer/1.cc: Test pointer arithmetic using
+       long long values.
+
 2018-10-12  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/include/ext/pointer.h b/libstdc++-v3/include/ext/pointer.h
index 8432da0d2a46f161b964ab1feff974d5087ec72f..3924cdd98b5fa5a1bf83728b1ec6c17539268092 100644 (file)
--- a/libstdc++-v3/include/ext/pointer.h
+++ b/libstdc++-v3/include/ext/pointer.h
@@ -437,6 +437,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _CXX_POINTER_ARITH_OPERATOR_SET(unsigned int);
       _CXX_POINTER_ARITH_OPERATOR_SET(long);
       _CXX_POINTER_ARITH_OPERATOR_SET(unsigned long);
+#ifdef _GLIBCXX_USE_LONG_LONG
+      _CXX_POINTER_ARITH_OPERATOR_SET(long long);
+      _CXX_POINTER_ARITH_OPERATOR_SET(unsigned long long);
+#endif
 
       // Mathematical Manipulators
       inline _Pointer_adapter& 

diff --git a/libstdc++-v3/testsuite/ext/ext_pointer/1.cc b/libstdc++-v3/testsuite/ext/ext_pointer/1.cc
index 096a15fb67159076d0cb4c07dd57d5163cf0bd18..56560a001b30a13e4ae03877eb4ae47dfe71dad5 100644 (file)
--- a/libstdc++-v3/testsuite/ext/ext_pointer/1.cc
+++ b/libstdc++-v3/testsuite/ext/ext_pointer/1.cc
@@ -180,11 +180,25 @@ void test04() {
   VERIFY(bPtr3 == aPtr);
 }
 
+// Check that long long values can be used for pointer arithmetic.
+void test05()
+{
+  A a[2] = { 1, 2 };
+  A_pointer p = a;
+  A_pointer q = p + 0ull;
+  VERIFY( p == q );
+  q += 0ll;
+  VERIFY( p == q );
+  q += 1ll;
+  VERIFY( q->i == p[1ll].i );
+}
+
 int main()
 {
   test01();
   test02();
   test03();
   test04();
+  test05();
   return 0;
 }