From 64fc3c68e5505d6a958eb6a5c33c2bf2863e5d64 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sun, 26 Apr 2009 20:50:44 +0000 Subject: [PATCH] Fix for PR4079: make sure to construct the member expressions for offsetof correctly in the presence of anonymous structs/unions. This could definitely use some cleanup, but I don't really want to mess with the anonymous union/struct code. llvm-svn: 70156 --- clang/lib/Sema/SemaExpr.cpp | 13 +++++++++---- clang/test/Sema/offsetof.c | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index e789e5428935..f2f8ae5797c7 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -4636,10 +4636,15 @@ Sema::OwningExprResult Sema::ActOnBuiltinOffsetOf(Scope *S, // FIXME: C++: Verify that MemberDecl isn't a static field. // FIXME: Verify that MemberDecl isn't a bitfield. - // MemberDecl->getType() doesn't get the right qualifiers, but it doesn't - // matter here. - Res = new (Context) MemberExpr(Res, false, MemberDecl, OC.LocEnd, - MemberDecl->getType().getNonReferenceType()); + if (cast(MemberDecl->getDeclContext())->isAnonymousStructOrUnion()) { + Res = static_cast(BuildAnonymousStructUnionMemberReference( + SourceLocation(), MemberDecl, Res, SourceLocation()).release()); + } else { + // MemberDecl->getType() doesn't get the right qualifiers, but it + // doesn't matter here. + Res = new (Context) MemberExpr(Res, false, MemberDecl, OC.LocEnd, + MemberDecl->getType().getNonReferenceType()); + } } } diff --git a/clang/test/Sema/offsetof.c b/clang/test/Sema/offsetof.c index 5e52de7245a7..f8b9fed03c3c 100644 --- a/clang/test/Sema/offsetof.c +++ b/clang/test/Sema/offsetof.c @@ -45,3 +45,6 @@ int a(int len) { int a[__builtin_offsetof(struct sockaddr_un, sun_path[len+1])]; } +// PR4079 +union x {struct {int x;};}; +int x[__builtin_offsetof(union x, x)];