include/dwarf2.def

@@ -175,8 +175,6 @@ DW_TAG (DW_TAG_GNU_formal_parameter_pack, 0x4108)
 DW_TAG (DW_TAG_GNU_call_site, 0x4109)
 DW_TAG (DW_TAG_GNU_call_site_parameter, 0x410a)
 
-/* GNU annotation extension used by btf_decl_tag and btf_type_tag.
-   See https://gcc.gnu.org/wiki/GNUAnnotationsDwarf .  */
 DW_TAG (DW_TAG_GNU_annotation, 0x6001)
 
 /* Extensions for UPC.  See: http://dwarfstd.org/doc/DWARF4.pdf.  */
@@ -461,8 +459,6 @@ DW_AT (DW_AT_GNU_pubtypes, 0x2135)
 DW_AT (DW_AT_GNU_discriminator, 0x2136)
 DW_AT (DW_AT_GNU_locviews, 0x2137)
 DW_AT (DW_AT_GNU_entry_view, 0x2138)
-/* GNU annotation extension used by btf_decl_tag and btf_type_tag.
-   See https://gcc.gnu.org/wiki/GNUAnnotationsDwarf .  */
 DW_AT (DW_AT_GNU_annotation, 0x2139)
 /* VMS extensions.  */
 DW_AT (DW_AT_VMS_rtnbeg_pd_address, 0x2201)

libstdc++-v3/include/std/stacktrace

@@ -683,32 +683,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   inline ostream&
   operator<<(ostream& __os, const stacktrace_entry& __f)
   {
-    if (!__f) [[unlikely]]
-      return __os << "<unknown>";
-
     string __desc, __file;
     int __line;
-    if (__f._M_get_info(&__desc, &__file, &__line)) [[likely]]
+    if (__f._M_get_info(&__desc, &__file, &__line))
       {
-	__os << ' ';
-	if (__desc.empty()) [[unlikely]]
-	  __os << "<unknown>";
-	else
-	  __os << __desc;
-	if (!__file.empty()) [[likely]]
-	  __os << " at " << __file << ':' << __line;
+	__os.width(4);
+	__os << __desc << " at " << __file << ':' << __line;
       }
-
-    struct _Flag_guard // Set and restore hex format
-    {
-      _Flag_guard(ios& __s) : _M_ios(__s) { }
-      ~_Flag_guard() { _M_ios.setf(_M_f); }
-
-      ios& _M_ios;
-      ios::fmtflags _M_f = _M_ios.setf(ios::hex, ios::basefield);
-    };
-    _Flag_guard __g(__os);
-    __os << " [0x" << __f.native_handle() << ']';
     return __os;
   }
 
@@ -716,8 +697,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     inline ostream&
     operator<<(ostream& __os, const basic_stacktrace<_Allocator>& __st)
     {
-      using size_type = typename basic_stacktrace<_Allocator>::size_type;
-      for (size_type __i = 0, __size = __st.size(); __i < __size; ++__i)
+      for (stacktrace::size_type __i = 0; __i < __st.size(); ++__i)
 	{
 	  __os.width(4);
 	  __os << __i << "# " << __st[__i] << '\n';