[PATCH] D31976: Avoid assert when a non-static member function is qualified with __unaligned

[Roger Ferrer Ibanez via Phabricator via cfe-commits]

rogfer01 created this revision.

Under `-fms-extensions` `__unaligned` is a type-qualifier that can be applied to a non-static member function declaration.

This causes an assertion when mangling the name under Itanium, where that qualifier is not mangled.

This patch justs makes the minimal change to avoid the crash and avoid mangling `__unaligned`.

The test just makes sure the clash is actually detected.


https://reviews.llvm.org/D31976

Files:
  lib/AST/ItaniumMangle.cpp
  test/CodeGenCXX/unaligned-duplicated-mangle-name.cpp


Index: test/CodeGenCXX/unaligned-duplicated-mangle-name.cpp
===================================================================
--- /dev/null
+++ test/CodeGenCXX/unaligned-duplicated-mangle-name.cpp
@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 -triple %itanium_abi_triple -fms-extensions -emit-llvm-only %s -verify
+
+struct A
+{
+    int x;
+    void foo() __unaligned;
+    void foo();
+};
+
+void A::foo() __unaligned
+{
+    this->x++;
+}
+
+void A::foo() // expected-error {{definition with same mangled name as another definition}}
+              // expected-note at -6 {{previous definition is here}}
+{
+    this->x++;
+}
+
Index: lib/AST/ItaniumMangle.cpp
===================================================================
--- lib/AST/ItaniumMangle.cpp
+++ lib/AST/ItaniumMangle.cpp
@@ -1455,10 +1455,12 @@
   Out << 'N';
   if (const CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(ND)) {
     Qualifiers MethodQuals =
-        Qualifiers::fromCVRMask(Method->getTypeQualifiers());
+        Qualifiers::fromCVRUMask(Method->getTypeQualifiers());
     // We do not consider restrict a distinguishing attribute for overloading
     // purposes so we must not mangle it.
     MethodQuals.removeRestrict();
+    // __unaligned is not currently mangled in any way, so remove it.
+    MethodQuals.removeUnaligned();
     mangleQualifiers(MethodQuals);
     mangleRefQualifier(Method->getRefQualifier());
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31976.94962.patch
Type: text/x-patch
Size: 1403 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170412/b36c0130/attachment-0001.bin>