<div dir="ltr">Out of curiosity, should/would this've shown up for you Apple folks too? (as a failure in the apple/lldb accelerator tables - because the names would be similarly incorrect) had it just not got to the necessary testing yet?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Oct 2, 2019 at 8:29 AM Adrian Prantl <<a href="mailto:aprantl@apple.com">aprantl@apple.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div style="overflow-wrap: break-word;"><br><div><br><blockquote type="cite"><div>On Oct 1, 2019, at 6:40 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>> wrote:</div><br><div><div dir="ltr">This broke gnu_pubnames and other forms of DWARF index of C++ code - fixed in r373420 (feel free to post-comimt review, etc, of course)</div><br></div></blockquote><div><br></div><div>Thanks!</div><div><br></div><div>-- adrian</div><br><blockquote type="cite"><div><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Sep 23, 2019 at 5:36 PM Adrian Prantl via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: adrian<br>
Date: Mon Sep 23 17:38:49 2019<br>
New Revision: 372681<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=372681&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=372681&view=rev</a><br>
Log:<br>
Support for DWARF-5 C++ language tags.<br>
<br>
This patch provides support for DW_LANG_C_plus_plus_11,<br>
DW_LANG_C_plus_plus_14 tags in the Clang C++ frontend.<br>
<br>
Patch by Sourabh Singh Tomar!<br>
Differential Revision: <a href="https://reviews.llvm.org/D67613" rel="noreferrer" target="_blank">https://reviews.llvm.org/D67613</a><br>
<br>
Reapplies r372663 after adapting a failing test in the LLDB testsuite.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/AST/DeclCXX.h<br>
cfe/trunk/lib/AST/DeclPrinter.cpp<br>
cfe/trunk/lib/AST/JSONNodeDumper.cpp<br>
cfe/trunk/lib/AST/TextNodeDumper.cpp<br>
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
cfe/trunk/lib/Sema/SemaModule.cpp<br>
cfe/trunk/test/Modules/ModuleDebugInfo.cpp<br>
<br>
Modified: cfe/trunk/include/clang/AST/DeclCXX.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/DeclCXX.h (original)<br>
+++ cfe/trunk/include/clang/AST/DeclCXX.h Mon Sep 23 17:38:49 2019<br>
@@ -42,6 +42,7 @@<br>
#include "llvm/ADT/PointerUnion.h"<br>
#include "llvm/ADT/STLExtras.h"<br>
#include "llvm/ADT/iterator_range.h"<br>
+#include "llvm/BinaryFormat/Dwarf.h"<br>
#include "llvm/Support/Casting.h"<br>
#include "llvm/Support/Compiler.h"<br>
#include "llvm/Support/PointerLikeTypeTraits.h"<br>
@@ -2941,8 +2942,10 @@ public:<br>
/// ensure a stable ABI for this, we choose the DW_LANG_ encodings<br>
/// from the dwarf standard.<br>
enum LanguageIDs {<br>
- lang_c = /* DW_LANG_C */ 0x0002,<br>
- lang_cxx = /* DW_LANG_C_plus_plus */ 0x0004<br>
+ lang_c = llvm::dwarf::DW_LANG_C,<br>
+ lang_cxx = llvm::dwarf::DW_LANG_C_plus_plus,<br>
+ lang_cxx_11 = llvm::dwarf::DW_LANG_C_plus_plus_11,<br>
+ lang_cxx_14 = llvm::dwarf::DW_LANG_C_plus_plus_14<br>
};<br>
<br>
private:<br>
<br>
Modified: cfe/trunk/lib/AST/DeclPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclPrinter.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclPrinter.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/DeclPrinter.cpp (original)<br>
+++ cfe/trunk/lib/AST/DeclPrinter.cpp Mon Sep 23 17:38:49 2019<br>
@@ -1001,12 +1001,19 @@ void DeclPrinter::VisitCXXRecordDecl(CXX<br>
<br>
void DeclPrinter::VisitLinkageSpecDecl(LinkageSpecDecl *D) {<br>
const char *l;<br>
- if (D->getLanguage() == LinkageSpecDecl::lang_c)<br>
+ switch (D->getLanguage()) {<br>
+ case LinkageSpecDecl::lang_c:<br>
l = "C";<br>
- else {<br>
- assert(D->getLanguage() == LinkageSpecDecl::lang_cxx &&<br>
- "unknown language in linkage specification");<br>
+ break;<br>
+ case LinkageSpecDecl::lang_cxx_14:<br>
+ l = "C++14";<br>
+ break;<br>
+ case LinkageSpecDecl::lang_cxx_11:<br>
+ l = "C++11";<br>
+ break;<br>
+ case LinkageSpecDecl::lang_cxx:<br>
l = "C++";<br>
+ break;<br>
}<br>
<br>
Out << "extern \"" << l << "\" ";<br>
<br>
Modified: cfe/trunk/lib/AST/JSONNodeDumper.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/JSONNodeDumper.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/JSONNodeDumper.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/JSONNodeDumper.cpp (original)<br>
+++ cfe/trunk/lib/AST/JSONNodeDumper.cpp Mon Sep 23 17:38:49 2019<br>
@@ -850,6 +850,12 @@ void JSONNodeDumper::VisitLinkageSpecDec<br>
switch (LSD->getLanguage()) {<br>
case LinkageSpecDecl::lang_c: Lang = "C"; break;<br>
case LinkageSpecDecl::lang_cxx: Lang = "C++"; break;<br>
+ case LinkageSpecDecl::lang_cxx_11:<br>
+ Lang = "C++11";<br>
+ break;<br>
+ case LinkageSpecDecl::lang_cxx_14:<br>
+ Lang = "C++14";<br>
+ break;<br>
}<br>
JOS.attribute("language", Lang);<br>
attributeOnlyIfTrue("hasBraces", LSD->hasBraces());<br>
<br>
Modified: cfe/trunk/lib/AST/TextNodeDumper.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TextNodeDumper.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TextNodeDumper.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/TextNodeDumper.cpp (original)<br>
+++ cfe/trunk/lib/AST/TextNodeDumper.cpp Mon Sep 23 17:38:49 2019<br>
@@ -1766,6 +1766,12 @@ void TextNodeDumper::VisitLinkageSpecDec<br>
case LinkageSpecDecl::lang_cxx:<br>
OS << " C++";<br>
break;<br>
+ case LinkageSpecDecl::lang_cxx_11:<br>
+ OS << " C++11";<br>
+ break;<br>
+ case LinkageSpecDecl::lang_cxx_14:<br>
+ OS << " C++14";<br>
+ break;<br>
}<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Mon Sep 23 17:38:49 2019<br>
@@ -561,6 +561,10 @@ void CGDebugInfo::CreateCompileUnit() {<br>
if (LO.CPlusPlus) {<br>
if (LO.ObjC)<br>
LangTag = llvm::dwarf::DW_LANG_ObjC_plus_plus;<br>
+ else if (LO.CPlusPlus14)<br>
+ LangTag = llvm::dwarf::DW_LANG_C_plus_plus_14;<br>
+ else if (LO.CPlusPlus11)<br>
+ LangTag = llvm::dwarf::DW_LANG_C_plus_plus_11;<br>
else<br>
LangTag = llvm::dwarf::DW_LANG_C_plus_plus;<br>
} else if (LO.ObjC) {<br>
@@ -878,6 +882,8 @@ llvm::DIType *CGDebugInfo::CreateType(co<br>
static bool hasCXXMangling(const TagDecl *TD, llvm::DICompileUnit *TheCU) {<br>
switch (TheCU->getSourceLanguage()) {<br>
case llvm::dwarf::DW_LANG_C_plus_plus:<br>
+ case llvm::dwarf::DW_LANG_C_plus_plus_11:<br>
+ case llvm::dwarf::DW_LANG_C_plus_plus_14:<br>
return true;<br>
case llvm::dwarf::DW_LANG_ObjC_plus_plus:<br>
return isa<CXXRecordDecl>(TD) || isa<EnumDecl>(TD);<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Mon Sep 23 17:38:49 2019<br>
@@ -5132,7 +5132,9 @@ void CodeGenModule::EmitObjCIvarInitiali<br>
// EmitLinkageSpec - Emit all declarations in a linkage spec.<br>
void CodeGenModule::EmitLinkageSpec(const LinkageSpecDecl *LSD) {<br>
if (LSD->getLanguage() != LinkageSpecDecl::lang_c &&<br>
- LSD->getLanguage() != LinkageSpecDecl::lang_cxx) {<br>
+ LSD->getLanguage() != LinkageSpecDecl::lang_cxx &&<br>
+ LSD->getLanguage() != LinkageSpecDecl::lang_cxx_11 &&<br>
+ LSD->getLanguage() != LinkageSpecDecl::lang_cxx_14) {<br>
ErrorUnsupported(LSD, "linkage spec");<br>
return;<br>
}<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Mon Sep 23 17:38:49 2019<br>
@@ -13982,6 +13982,10 @@ Decl *Sema::ActOnStartLinkageSpecificati<br>
Language = LinkageSpecDecl::lang_c;<br>
else if (Lang == "C++")<br>
Language = LinkageSpecDecl::lang_cxx;<br>
+ else if (Lang == "C++11")<br>
+ Language = LinkageSpecDecl::lang_cxx_11;<br>
+ else if (Lang == "C++14")<br>
+ Language = LinkageSpecDecl::lang_cxx_14;<br>
else {<br>
Diag(LangStr->getExprLoc(), diag::err_language_linkage_spec_unknown)<br>
<< LangStr->getSourceRange();<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaModule.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaModule.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaModule.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaModule.cpp Mon Sep 23 17:38:49 2019<br>
@@ -31,6 +31,8 @@ static void checkModuleImportContext(Sem<br>
ExternCLoc = LSD->getBeginLoc();<br>
break;<br>
case LinkageSpecDecl::lang_cxx:<br>
+ case LinkageSpecDecl::lang_cxx_11:<br>
+ case LinkageSpecDecl::lang_cxx_14:<br>
break;<br>
}<br>
DC = LSD->getParent();<br>
<br>
Modified: cfe/trunk/test/Modules/ModuleDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=372681&r1=372680&r2=372681&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=372681&r1=372680&r2=372681&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/ModuleDebugInfo.cpp (original)<br>
+++ cfe/trunk/test/Modules/ModuleDebugInfo.cpp Mon Sep 23 17:38:49 2019<br>
@@ -12,7 +12,7 @@<br>
<br>
// PCH:<br>
// RUN: %clang_cc1 -triple %itanium_abi_triple -x c++ -std=c++11 -debugger-tuning=lldb -emit-pch -fmodule-format=obj -I %S/Inputs -o %t.pch %S/Inputs/DebugCXX.h -mllvm -debug-only=pchcontainer &>%t-pch.ll<br>
-// RUN: cat %t-pch.ll | FileCheck %s<br>
+// RUN: cat %t-pch.ll | FileCheck --check-prefix=CHECK-CXX %s<br>
// RUN: cat %t-pch.ll | FileCheck --check-prefix=CHECK-NEG %s<br>
<br>
#ifdef MODULES<br>
@@ -23,6 +23,7 @@<br>
// CHECK-MOD: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus,<br>
<br>
// CHECK: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus,<br>
+// CHECK-CXX: distinct !DICompileUnit(language: DW_LANG_C_plus_plus_11,<br>
// CHECK-SAME: isOptimized: false,<br>
// CHECK-NOT: splitDebugFilename:<br>
// CHECK-SAME: dwoId:<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>
</div></blockquote></div><br></div></blockquote></div>