shchenz updated this revision to Diff 484994.
shchenz added a comment.
address @dblaikie comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D140544/new/
https://reviews.llvm.org/D140544
Files:
clang/lib/CodeGen/CGDebugInfo.cpp
clang/test/CodeGen/debug-info-programming-language.c
Index: clang/test/CodeGen/debug-info-programming-language.c
===================================================================
--- clang/test/CodeGen/debug-info-programming-language.c
+++ clang/test/CodeGen/debug-info-programming-language.c
@@ -4,7 +4,14 @@
// RUN: %clang_cc1 -dwarf-version=3 -emit-llvm -triple %itanium_abi_triple %s
-o - \
// RUN: -x c -std=c17 -O0 -disable-llvm-passes -debug-info-kind=limited \
// RUN: | FileCheck --check-prefix=CHECK-C17 %s
+// RUN: %clang_cc1 -dwarf-version=3 -emit-llvm -triple %itanium_abi_triple %s
-o - \
+// RUN: -x c -std=c11 -O0 -disable-llvm-passes -debug-info-kind=limited \
+// RUN: -gstrict-dwarf | FileCheck --check-prefix=CHECK-STRICT %s
+// RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -triple %itanium_abi_triple %s
-o - \
+// RUN: -x c -std=c11 -O0 -disable-llvm-passes -debug-info-kind=limited \
+// RUN: -gstrict-dwarf | FileCheck --check-prefix=CHECK-C11 %s
+// CHECK-STRICT: !DICompileUnit(language: DW_LANG_C99
// CHECK-C11: !DICompileUnit(language: DW_LANG_C11
// Update this check once support for DW_LANG_C17 is broadly supported/known in
// consumers. Maybe we'll skip this and go to the DWARFv6 language+version
Index: clang/lib/CodeGen/CGDebugInfo.cpp
===================================================================
--- clang/lib/CodeGen/CGDebugInfo.cpp
+++ clang/lib/CodeGen/CGDebugInfo.cpp
@@ -578,8 +578,8 @@
LangTag = llvm::dwarf::DW_LANG_OpenCL;
} else if (LO.RenderScript) {
LangTag = llvm::dwarf::DW_LANG_GOOGLE_RenderScript;
- } else if (LO.C11) {
- LangTag = llvm::dwarf::DW_LANG_C11;
+ } else if (LO.C11 && !(CGO.DebugStrictDwarf && CGO.DwarfVersion < 5)) {
+ LangTag = llvm::dwarf::DW_LANG_C11;
} else if (LO.C99) {
LangTag = llvm::dwarf::DW_LANG_C99;
} else {
Index: clang/test/CodeGen/debug-info-programming-language.c
===================================================================
--- clang/test/CodeGen/debug-info-programming-language.c
+++ clang/test/CodeGen/debug-info-programming-language.c
@@ -4,7 +4,14 @@
// RUN: %clang_cc1 -dwarf-version=3 -emit-llvm -triple %itanium_abi_triple %s -o - \
// RUN: -x c -std=c17 -O0 -disable-llvm-passes -debug-info-kind=limited \
// RUN: | FileCheck --check-prefix=CHECK-C17 %s
+// RUN: %clang_cc1 -dwarf-version=3 -emit-llvm -triple %itanium_abi_triple %s -o - \
+// RUN: -x c -std=c11 -O0 -disable-llvm-passes -debug-info-kind=limited \
+// RUN: -gstrict-dwarf | FileCheck --check-prefix=CHECK-STRICT %s
+// RUN: %clang_cc1 -dwarf-version=5 -emit-llvm -triple %itanium_abi_triple %s -o - \
+// RUN: -x c -std=c11 -O0 -disable-llvm-passes -debug-info-kind=limited \
+// RUN: -gstrict-dwarf | FileCheck --check-prefix=CHECK-C11 %s
+// CHECK-STRICT: !DICompileUnit(language: DW_LANG_C99
// CHECK-C11: !DICompileUnit(language: DW_LANG_C11
// Update this check once support for DW_LANG_C17 is broadly supported/known in
// consumers. Maybe we'll skip this and go to the DWARFv6 language+version
Index: clang/lib/CodeGen/CGDebugInfo.cpp
===================================================================
--- clang/lib/CodeGen/CGDebugInfo.cpp
+++ clang/lib/CodeGen/CGDebugInfo.cpp
@@ -578,8 +578,8 @@
LangTag = llvm::dwarf::DW_LANG_OpenCL;
} else if (LO.RenderScript) {
LangTag = llvm::dwarf::DW_LANG_GOOGLE_RenderScript;
- } else if (LO.C11) {
- LangTag = llvm::dwarf::DW_LANG_C11;
+ } else if (LO.C11 && !(CGO.DebugStrictDwarf && CGO.DwarfVersion < 5)) {
+ LangTag = llvm::dwarf::DW_LANG_C11;
} else if (LO.C99) {
LangTag = llvm::dwarf::DW_LANG_C99;
} else {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
