[PATCH] D47875: [MS ABI] Mangle unnamed empty enums (PR37723)
Hans Wennborg via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Jun 7 04:53:12 PDT 2018
hans created this revision.
hans added a reviewer: majnemer.
Clang would previously assert here.
https://reviews.llvm.org/D47875
Files:
lib/AST/MicrosoftMangle.cpp
test/CodeGenCXX/mangle-ms-cxx11.cpp
Index: test/CodeGenCXX/mangle-ms-cxx11.cpp
===================================================================
--- test/CodeGenCXX/mangle-ms-cxx11.cpp
+++ test/CodeGenCXX/mangle-ms-cxx11.cpp
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -triple=i386-pc-win32 -fms-compatibility-version=19.00 | FileCheck %s --check-prefix=CHECK --check-prefix=MSVC2015
// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -triple=i386-pc-win32 -fms-compatibility-version=18.00 | FileCheck %s --check-prefix=CHECK --check-prefix=MSVC2013
+// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -triple=i386-pc-win32 -gcodeview -debug-info-kind=limited | FileCheck %s --check-prefix=DBG
namespace FTypeWithQuals {
template <typename T>
@@ -350,3 +351,9 @@
void f(decltype(enumerator)) {}
// CHECK-DAG: define internal void @"?f@@YAXW4<unnamed-enum-enumerator>@@@Z"(
void use_f() { f(enumerator); }
+
+namespace pr37723 {
+struct s { enum {}; };
+// DBG-DAG: DW_TAG_enumeration_type{{.*}}identifier: ".?AW4<unnamed-tag>@s at pr37723@@"
+s x;
+}
Index: lib/AST/MicrosoftMangle.cpp
===================================================================
--- lib/AST/MicrosoftMangle.cpp
+++ lib/AST/MicrosoftMangle.cpp
@@ -886,9 +886,12 @@
Name += TND->getName();
} else if (auto *ED = dyn_cast<EnumDecl>(TD)) {
auto EnumeratorI = ED->enumerator_begin();
- assert(EnumeratorI != ED->enumerator_end());
- Name += "<unnamed-enum-";
- Name += EnumeratorI->getName();
+ if (EnumeratorI == ED->enumerator_end()) {
+ Name += "<unnamed-tag";
+ } else {
+ Name += "<unnamed-enum-";
+ Name += EnumeratorI->getName();
+ }
} else {
// Otherwise, number the types using a $S prefix.
Name += "<unnamed-type-$S";
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47875.150299.patch
Type: text/x-patch
Size: 1854 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180607/7bc7d8f9/attachment.bin>
More information about the cfe-commits
mailing list