PR c++/91979 - mangling nullptr expression

2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>

gcc/cp
        * cp/mangle.c (write_template_arg_literal): Handle nullptr
        mangling.
gcc
	* common.opt (-fabi-version): Document =14.
	* doc/invoke.texi (C++ Dialect Options): Likewise.
gcc/c-family
        * c-opts.c (c_common_post_options): Update
        latest_abi_version.
libiberty
        * cp-demangle.c (d_expr_primary): Handle
        nullptr demangling.
        * testsuite/demangle-expected: Added test.

From-SVN: r277801

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 254b3950a8e0b27320f2f84ead5ad624c498baee..e726ff6d0a0f5a6b5b47e1204b1f3df6e66d3491 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+       * common.opt (-fabi-version): Document =14.
+       * doc/invoke.texi (C++ Dialect Options): Likewise.
+
 2019-11-04  Aldy Hernandez  <aldyh@redhat.com>
 
        * tree-vrp.c (value_range_base::set): Do not special case pointers.

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 9e93911fab22f0f250ec3af5a5706ea57609c197..d95424537a9874d07eeaeb483a69b73c9695866f 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+       * c-opts.c (c_common_post_options): Update
+       latest_abi_version.
+
 2019-11-02  Jakub Jelinek  <jakub@redhat.com>
 
        * c-common.h (c_omp_get_context_selector): Remove.

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 0fffe60b1409c93c491a0f1e29a609e5ab73f40f..d4c77be5cd56477312148511deb02ed7af12b3fb 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -937,7 +937,7 @@ c_common_post_options (const char **pfilename)
 
   /* Change flag_abi_version to be the actual current ABI level, for the
      benefit of c_cpp_builtins, and to make comparison simpler.  */
-  const int latest_abi_version = 13;
+  const int latest_abi_version = 14;
   /* Generate compatibility aliases for ABI v11 (7.1) by default.  */
   const int abi_compat_default = 11;
 

diff --git a/gcc/common.opt b/gcc/common.opt
index cc279f411d7967209a111d958437595ce5cacd3a..fdd923e3c35679f48f5e202c3eb4e0db67ef3807 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -951,6 +951,8 @@ Driver Undocumented
 ; 13: Fixes the accidental change in 12 to the calling convention for classes
 ;     with deleted copy constructor and trivial move constructor.
 ;     Default in G++ 8.2.
+; 14: Corrects the mangling of nullptr expression.
+;     Default in G++ 10.
 ;
 ; Additional positive integers will be assigned as new versions of
 ; the ABI become the default version of the ABI.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7c22a5333390f723522d789154f15be35ab02385..0f7571633a7213204ed9e84c90a8db36a621d00c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+       PR c++/91979 - mangling nullptr expression
+       * cp/mangle.c (write_template_arg_literal): Handle nullptr
+       mangling.
+
 2019-11-04  Jason Merrill  <jason@redhat.com>
 
        * typeck.c (check_return_expr): Avoid redundant error.

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index a9333b84349eb883aac6ef24a51e67e1f55abcad..0ac04514e8e8a38b6d02f7947a571810afd645cf 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -3400,7 +3400,9 @@ write_template_arg_literal (const tree value)
       case INTEGER_CST:
        gcc_assert (!same_type_p (TREE_TYPE (value), boolean_type_node)
                    || integer_zerop (value) || integer_onep (value));
-       write_integer_cst (value);
+       if (!(abi_version_at_least (14)
+             && NULLPTR_TYPE_P (TREE_TYPE (value))))
+         write_integer_cst (value);
        break;
 
       case REAL_CST:

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index bf3ea3f6c046f652f81dd104ef0a4d03e26fff9a..cf7cf206193d96e3b90b43d42c04a8673c13f987 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -2413,6 +2413,9 @@ trivial move constructor.
 Version 13, which first appeared in G++ 8.2, fixes the accidental
 change in version 12.
 
+Version 14, which first appeared in G++ 10, corrects the mangling of
+the nullptr expression.
+
 See also @option{-Wabi}.
 
 @item -fabi-compat-version=@var{n}

diff --git a/gcc/testsuite/g++.dg/abi/macro0.C b/gcc/testsuite/g++.dg/abi/macro0.C
index 01a3541aa7d2db3ee25f919301900f266266451a..08106004c4d0a1ec348ea0a20a2bb4594754275a 100644 (file)
--- a/gcc/testsuite/g++.dg/abi/macro0.C
+++ b/gcc/testsuite/g++.dg/abi/macro0.C
@@ -1,6 +1,6 @@
 // This testcase will need to be kept in sync with c_common_post_options.
 // { dg-options "-fabi-version=0" }
 
-#if __GXX_ABI_VERSION != 1013
+#if __GXX_ABI_VERSION != 1014
 #error "Incorrect value of __GXX_ABI_VERSION"
 #endif

diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr27.C b/gcc/testsuite/g++.dg/cpp0x/nullptr27.C
index 2510dc80634072b9bb2a4166055110ff738830ed..edd116062660b2a29ccec0e29149bebeef55c3bd 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr27.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr27.C
@@ -1,7 +1,7 @@
 // PR c++/52706
 // { dg-do compile { target c++11 } }
 // { dg-options "-fabi-version=0" }
-// { dg-final { scan-assembler "_Z1fIDnLDn0EEiT_" } }
+// { dg-final { scan-assembler "_Z1fIDnLDnEEiT_" } }
 
 template<class T, decltype(nullptr) = nullptr>
 int f(T);

diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr43.C b/gcc/testsuite/g++.dg/cpp0x/nullptr43.C
new file mode 100644 (file)
index 0000000..fbdb6cd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr43.C
@@ -0,0 +1,9 @@
+// PR c++/91979
+// { dg-do compile { target c++11 } }
+// { dg-options "-fabi-version=13" }
+// { dg-final { scan-assembler "_Z1fIDnLDn0EEiT_" } }
+
+template<class T, decltype(nullptr) = nullptr>
+int f(T);
+
+int i2 = f(nullptr);

diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr44.C b/gcc/testsuite/g++.dg/cpp0x/nullptr44.C
new file mode 100644 (file)
index 0000000..9ceba14
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr44.C
@@ -0,0 +1,15 @@
+// PR c++/91979
+// { dg-do compile { target c++11 } }
+// { dg-final { scan-assembler "_Z3fooILPv0EEvPN9enable_ifIXeqT_LDnEEvE4typeE" } }
+
+template <bool, typename T = void>
+struct enable_if {};
+
+template <typename T>
+struct enable_if<true, T> { typedef T type; };
+
+template <void *P>
+void foo(typename enable_if<P == nullptr>::type* = 0) {}
+
+template void foo<(void *)0>(void *);
+

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 4992b15d681a470548d1509fa466c5ccd6993f0d..b6f9e2de60d3ddc8080e13add8fe955aa310b5c3 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-04  Kamlesh Kumar  <kamleshbhalui@gmail.com>
+
+       * cp-demangle.c (d_expr_primary): Handle
+       nullptr demangling.
+       * testsuite/demangle-expected: Added test.
+
 2019-10-29 Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        * cp-demangle.c (d_number): Avoid signed int overflow.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 5b674d7d93c4612723c9580c05ee7806d774d16c..963217c37bd66b9c3f2b9e281f7999c1e741b428 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -3577,6 +3577,17 @@ d_expr_primary (struct d_info *di)
          && type->u.s_builtin.type->print != D_PRINT_DEFAULT)
        di->expansion -= type->u.s_builtin.type->len;
 
+      if (type->type == DEMANGLE_COMPONENT_BUILTIN_TYPE
+         && strcmp (type->u.s_builtin.type->name,
+                    cplus_demangle_builtin_types[33].name) == 0)
+       {
+         if (d_peek_char (di) == 'E')
+           {
+             d_advance (di, 1);
+             return type;
+           }
+       }
+
       /* Rather than try to interpret the literal value, we just
         collect it as a string.  Note that it's possible to have a
         floating point literal here.  The ABI specifies that the

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 61681484d0e658068b2186d62a74d96628c4373b..f68a8a71aaf2dafd9e67c4c1adad90fbe09c3283 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -1446,3 +1446,7 @@ Foo<int>()::X::fn
 _ZZZ3FooIiEfvENKUlT_E_clIcEEDaS0_EN1X2fnEv
 Foo<int>()::{lambda(auto:1)#1}::operator()<char>(char) const::X::fn()
 Foo<int>()::{lambda(auto:1)#1}::operator()<char>(char) const::X::fn
+#PR91979 demangling nullptr expression
+
+_Z3fooILPv0EEvPN9enable_ifIXeqT_LDnEEvE4typeE
+void foo<(void*)0>(enable_if<((void*)0)==((decltype(nullptr))), void>::type*)