[llvm] 49c519a - DebugInfo: Rebuild decltype(nullptr) as 'std::nullptr_t'

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2021-09-21T11:37:30-07:00
New Revision: 49c519a84856d018578ed2af625b114771f666e4

URL: https://github.com/llvm/llvm-project/commit/49c519a84856d018578ed2af625b114771f666e4
DIFF: https://github.com/llvm/llvm-project/commit/49c519a84856d018578ed2af625b114771f666e4.diff

LOG: DebugInfo: Rebuild decltype(nullptr) as 'std::nullptr_t'

Now that Clang's been changed to render nullptr types/template
parameters as 'std::nullptr_t' do the same thing down here.

(Clang commit: 131e8786640a49daf533b7ead4d3b5b82e0aea2a )

Added: 
    

Modified: 
    llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
    llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
index 2dc51464dadfe..eb6758b9725ed 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
@@ -262,7 +262,7 @@ struct DWARFTypePrinter {
     case DW_TAG_unspecified_type: {
       StringRef TypeName = D.getShortName();
       if (TypeName == "decltype(nullptr)")
-        TypeName = "nullptr_t";
+        TypeName = "std::nullptr_t";
       Word = true;
       OS << TypeName;
       EndedWithTemplate = false;

diff  --git a/llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s b/llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s
index aedf9c66de7c2..6c2dc4d51f9f4 100644
--- a/llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s
+++ b/llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s
@@ -59,7 +59,7 @@
 # accurate and not be ambiguous with some arbitrary ::nullptr_t a user could
 # define. If that change is made, this code/test should be fixed too.
 # nullptr_t unspecified type
-# CHECK:   DW_AT_type{{.*}}"nullptr_t"
+# CHECK:   DW_AT_type{{.*}}"std::nullptr_t"
 
 # reference_type
 # CHECK:   DW_AT_type{{.*}}"int &"