[PATCH] D27478: Make ASTContext::getDeclAlign return the correct alignment for FunctionDecls

[Akira Hatanaka via Phabricator via cfe-commits]

ahatanak updated this revision to Diff 80464.
ahatanak added a comment.

Call getTypeInfoImpl from getDeclAlign to get the alignment of functions.


https://reviews.llvm.org/D27478

Files:
  lib/AST/ASTContext.cpp
  test/Sema/warn-cast-align.c


Index: test/Sema/warn-cast-align.c
===================================================================
--- test/Sema/warn-cast-align.c
+++ test/Sema/warn-cast-align.c
@@ -59,3 +59,11 @@
   i = (int *)&s.s0;
   i = (int *)a;
 }
+
+// No warnings.
+typedef int (*FnTy)(void);
+unsigned int func5(void);
+
+FnTy test5(void) {
+  return (FnTy)&func5;
+}
Index: lib/AST/ASTContext.cpp
===================================================================
--- lib/AST/ASTContext.cpp
+++ lib/AST/ASTContext.cpp
@@ -1455,7 +1455,9 @@
         T = getPointerType(RT->getPointeeType());
     }
     QualType BaseT = getBaseElementType(T);
-    if (!BaseT->isIncompleteType() && !T->isFunctionType()) {
+    if (T->isFunctionType())
+      Align = getTypeInfoImpl(T.getTypePtr()).Align;
+    else if (!BaseT->isIncompleteType()) {
       // Adjust alignments of declarations with array type by the
       // large-array alignment on the target.
       if (const ArrayType *arrayType = getAsArrayType(T)) {



Index: test/Sema/warn-cast-align.c
===================================================================
--- test/Sema/warn-cast-align.c
+++ test/Sema/warn-cast-align.c
@@ -59,3 +59,11 @@
   i = (int *)&s.s0;
   i = (int *)a;
 }
+
+// No warnings.
+typedef int (*FnTy)(void);
+unsigned int func5(void);
+
+FnTy test5(void) {
+  return (FnTy)&func5;
+}
Index: lib/AST/ASTContext.cpp
===================================================================
--- lib/AST/ASTContext.cpp
+++ lib/AST/ASTContext.cpp
@@ -1455,7 +1455,9 @@
         T = getPointerType(RT->getPointeeType());
     }
     QualType BaseT = getBaseElementType(T);
-    if (!BaseT->isIncompleteType() && !T->isFunctionType()) {
+    if (T->isFunctionType())
+      Align = getTypeInfoImpl(T.getTypePtr()).Align;
+    else if (!BaseT->isIncompleteType()) {
       // Adjust alignments of declarations with array type by the
       // large-array alignment on the target.
       if (const ArrayType *arrayType = getAsArrayType(T)) {

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits