diff options
| -rw-r--r-- | lib/CodeGen/CGBlocks.cpp | 10 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 10 | ||||
| -rw-r--r-- | test/CodeGen/const-init.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index db1539bd63..16e926ba64 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -625,6 +625,16 @@ CodeGenFunction::GenerateBlockFunction(const BlockExpr *BExpr, LocalDeclMap[VD] = i->second; } + // FIXME: We need to rearrange the code for copy/dispose so we have this + // sooner, so we can calculate offsets correctly. + if (!BlockHasCopyDispose) + BlockOffset = CGM.getTargetData() + .getTypeStoreSizeInBits(CGM.getGenericBlockLiteralType()) / 8; + else + BlockOffset = CGM.getTargetData() + .getTypeStoreSizeInBits(CGM.getGenericExtendedBlockLiteralType()) / 8; + BlockAlign = getContext().getTypeAlign(getContext().VoidPtrTy) / 8; + const FunctionProtoType *FTy = cast<FunctionProtoType>(BExpr->getFunctionType()); diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index 1d9f0f844e..68d10ff56e 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -29,16 +29,6 @@ CodeGenFunction::CodeGenFunction(CodeGenModule &cgm) DebugInfo(0), SwitchInsn(0), CaseRangeBlock(0), InvokeDest(0) { LLVMIntTy = ConvertType(getContext().IntTy); LLVMPointerWidth = Target.getPointerWidth(0); - - // FIXME: We need to rearrange the code for copy/dispose so we have this - // sooner, so we can calculate offsets correctly. - if (!BlockHasCopyDispose) - BlockOffset = CGM.getTargetData() - .getTypeStoreSizeInBits(CGM.getGenericBlockLiteralType()) / 8; - else - BlockOffset = CGM.getTargetData() - .getTypeStoreSizeInBits(CGM.getGenericExtendedBlockLiteralType()) / 8; - BlockAlign = getContext().getTypeAlign(getContext().VoidPtrTy) / 8; } ASTContext &CodeGenFunction::getContext() const { diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c index e7b83a33ce..a7220e0c29 100644 --- a/test/CodeGen/const-init.c +++ b/test/CodeGen/const-init.c @@ -28,13 +28,13 @@ _Complex double g1x = 1.0f; _Complex double g1y = 1.0fi; // RUN: grep '@g1 = global %. { i8 1, i8 10 }' %t && _Complex char g1 = (char) 1 + (char) 10 * 1i; -// RUN: grep '@g2 = global .struct.__block_descriptor { i32 1, i32 10 }' %t && +// RUN: grep '@g2 = global %2 { i32 1, i32 10 }' %t && _Complex int g2 = 1 + 10i; // RUN: grep '@g3 = global %. { float 1.000000e+00, float 1.000000e+01 }' %t && _Complex float g3 = 1.0 + 10.0i; // RUN: grep '@g4 = global %. { double 1.000000e+00, double 1.000000e+01 }' %t && _Complex double g4 = 1.0 + 10.0i; -// RUN: grep '@g5 = global .struct.__block_descriptor zeroinitializer' %t && +// RUN: grep '@g5 = global %2 zeroinitializer' %t && _Complex int g5 = (2 + 3i) == (5 + 7i); // RUN: grep '@g6 = global %. { double -1.100000e+01, double 2.900000e+01 }' %t && _Complex double g6 = (2.0 + 3.0i) * (5.0 + 7.0i); |