Author: Esme-Yi Date: 2021-04-12T11:05:55Z New Revision: dff922f39b9bf49b243f6f00c7c9a2e3de77e20e
URL: https://github.com/llvm/llvm-project/commit/dff922f39b9bf49b243f6f00c7c9a2e3de77e20e DIFF: https://github.com/llvm/llvm-project/commit/dff922f39b9bf49b243f6f00c7c9a2e3de77e20e.diff LOG: Reland [DebugInfo] Fix the mismatching between C++ language tags and Dwarf versions."" This reverts commit c965e14a12955355ead9ea093989a8fcbf03a8c1. Added: clang/test/CodeGenCXX/debug-info-programming-language.cpp Modified: clang/lib/CodeGen/CGDebugInfo.cpp clang/test/Modules/ModuleDebugInfo.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index d20b309b476de..290cdbf8c4e34 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -568,9 +568,9 @@ void CGDebugInfo::CreateCompileUnit() { if (LO.CPlusPlus) { if (LO.ObjC) LangTag = llvm::dwarf::DW_LANG_ObjC_plus_plus; - else if (LO.CPlusPlus14) + else if (LO.CPlusPlus14 && CGM.getCodeGenOpts().DwarfVersion >= 5) LangTag = llvm::dwarf::DW_LANG_C_plus_plus_14; - else if (LO.CPlusPlus11) + else if (LO.CPlusPlus11 && CGM.getCodeGenOpts().DwarfVersion >= 5) LangTag = llvm::dwarf::DW_LANG_C_plus_plus_11; else LangTag = llvm::dwarf::DW_LANG_C_plus_plus; diff --git a/clang/test/CodeGenCXX/debug-info-programming-language.cpp b/clang/test/CodeGenCXX/debug-info-programming-language.cpp new file mode 100644 index 0000000000000..82a6db6445f36 --- /dev/null +++ b/clang/test/CodeGenCXX/debug-info-programming-language.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -triple %itanium_abi_triple %s -o - \ +// RUN: -x c++ -std=c++14 -O0 -disable-llvm-passes -debug-info-kind=limited \ +// RUN: | FileCheck --check-prefix=CHECK-DWARF5 %s +// RUN: %clang_cc1 -dwarf-version=3 -emit-llvm -triple %itanium_abi_triple %s -o - \ +// RUN: -x c++ -std=c++14 -O0 -disable-llvm-passes -debug-info-kind=limited \ +// RUN: | FileCheck --check-prefix=CHECK-DWARF3 %s + +int main() { + return 0; +} + +// CHECK-DWARF5: distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, +// CHECK-DWARF3: distinct !DICompileUnit(language: DW_LANG_C_plus_plus, diff --git a/clang/test/Modules/ModuleDebugInfo.cpp b/clang/test/Modules/ModuleDebugInfo.cpp index 3121719e55a66..836f0d28fb2a2 100644 --- a/clang/test/Modules/ModuleDebugInfo.cpp +++ b/clang/test/Modules/ModuleDebugInfo.cpp @@ -23,7 +23,7 @@ // CHECK-MOD: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus, // CHECK: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus, -// CHECK-CXX: distinct !DICompileUnit(language: DW_LANG_C_plus_plus_11, +// CHECK-CXX: distinct !DICompileUnit(language: DW_LANG_C_plus_plus, // CHECK-SAME: isOptimized: false, // CHECK-NOT: splitDebugFilename: // CHECK-SAME: dwoId: _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
