maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Match union field type when member expression is u->x 

llvm-svn: 44879
This commit is contained in:
Devang Patel 2007-12-11 21:33:16 +00:00
parent d4e5fbacab
commit b37b12d102
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/CodeGen/CGExpr.cpp
View File

@ -387,16 +387,24 @@ EmitOCUVectorElementExpr(const OCUVectorElementExpr *E) {
LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) {
bool isUnion = false;
Expr *BaseExpr = E->getBase();
llvm::Value *BaseValue = NULL;
// If this is s.x, emit s as an lvalue. If it is s->x, emit s as a scalar.
if (E->isArrow())
if (E->isArrow()) {
BaseValue = EmitScalarExpr(BaseExpr);
const PointerType *PTy =
cast<PointerType>(BaseExpr->getType().getCanonicalType());
if (PTy->getPointeeType()->isUnionType())
isUnion = true;
}
else {
LValue BaseLV = EmitLValue(BaseExpr);
// FIXME: this isn't right for bitfields.
BaseValue = BaseLV.getAddress();
if (BaseExpr->getType()->isUnionType())
isUnion = true;
}
FieldDecl *Field = E->getMemberDecl();
@ -409,7 +417,7 @@ LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) {
llvm::Value *V = Builder.CreateGEP(BaseValue,Idxs, Idxs + 2, "tmp");
// Match union field type.
if (BaseExpr->getType()->isUnionType()) {
if (isUnion) {
const llvm::Type * FieldTy = ConvertType(Field->getType());
const llvm::PointerType * BaseTy =
cast<llvm::PointerType>(BaseValue->getType());

6
clang/test/CodeGen/union.c
View File

@ -1,6 +1,6 @@
// RUN: clang %s -emit-llvm
union {
union u_tag {
int a;
float b;
} u;
@ -9,6 +9,10 @@ void f() {
u.b = 11;
}
float get_b(union u_tag *my_u) {
return my_u->b;
}
int f2( float __x ) {
union{
float __f;