commit d93add34b752b1b18a100f785e72f1f38f6479a6
author Roger Ferrer Ibanez <roger.ferreribanez@arm.com> Fri Feb 24 08:41:09 2017 +0000
committer Roger Ferrer Ibanez <roger.ferreribanez@arm.com> Fri Feb 24 08:41:09 2017 +0000
tree 5966c6fc1d6277fd9953e669f748013ae0d88032
parent 83143a8e3e450e719d7ab62fa475723cf6120d1c

Fix crash when an incorrect redeclaration only differs in __unaligned type-qualifier

Fix an assertion that is hit when a redeclaration with differing types only
differs in the unaligned type-qualifier.

Differential Revision: https://reviews.llvm.org/D29986

llvm-svn: 296099

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 103c7e1..922d74e 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -8077,7 +8077,8 @@
     // mismatch.
     if (LQuals.getCVRQualifiers() != RQuals.getCVRQualifiers() ||
         LQuals.getAddressSpace() != RQuals.getAddressSpace() ||
-        LQuals.getObjCLifetime() != RQuals.getObjCLifetime())
+        LQuals.getObjCLifetime() != RQuals.getObjCLifetime() ||
+        LQuals.hasUnaligned() != RQuals.hasUnaligned())
       return QualType();
 
     // Exactly one GC qualifier difference is allowed: __strong is

clang/test/Sema/unaligned-qualifier.c

diff --git a/clang/test/Sema/unaligned-qualifier.c b/clang/test/Sema/unaligned-qualifier.c
new file mode 100644
index 0000000..3a66c4f
--- /dev/null
+++ b/clang/test/Sema/unaligned-qualifier.c
@@ -0,0 +1,4 @@
+// RUN: %clang_cc1 %s -verify -fsyntax-only -fms-extensions
+
+int __unaligned * p1; // expected-note {{previous definition is here}}
+int * p1; // expected-error {{redefinition of 'p1' with a different type: 'int *' vs '__unaligned int *'}}