diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-11-13 21:23:46 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-11-13 21:23:46 +0000 |
| commit | 64241fc930e0b2247e8c5b5af9d48d13c4bec8ae (patch) | |
| tree | b681058141b59e0bff47a86b123fdb2505f24e22 | |
| parent | 6fb98d9172ebbb73e14db5e08ecc4361eccc76e1 (diff) | |
Obvious fix for PR5474.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88696 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/const-init.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index 3578617491..644ec107e9 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -262,7 +262,7 @@ class VISIBILITY_HIDDEN ConstStructBuilder { uint64_t NumBytes = AlignedElementOffsetInBytes - ElementOffsetInBytes; - const llvm::Type *Ty = llvm::Type::getInt8Ty(CGF->getLLVMContext()); + const llvm::Type *Ty = llvm::Type::getInt8Ty(CGM.getLLVMContext()); if (NumBytes > 1) Ty = llvm::ArrayType::get(Ty, NumBytes); diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c index e25da9c6eb..caef3e14c0 100644 --- a/test/CodeGen/const-init.c +++ b/test/CodeGen/const-init.c @@ -111,3 +111,9 @@ void *g20(void) { // PR4108 struct g21 {int g21;}; const struct g21 g21 = (struct g21){1}; + +// PR5474 +struct g22 {int x;} __attribute((packed)); +struct g23 {char a; short b; char c; struct g22 d;}; +struct g23 g24 = {1,2,3,4}; + |