diff options
| -rw-r--r-- | clang/lib/CodeGen/CGObjCMac.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGObjCRuntime.h | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenObjCXX/blocks.mm | 15 |
3 files changed, 1 insertions, 20 deletions
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 641d1571382..c29b435b978 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -2517,8 +2517,7 @@ llvm::Constant *CGObjCCommonMac::getBitmapBlockLayout(bool ComputeByrefLayout) { printf(", BL_WEAK:%d", (int) numWeak); printf(", BL_OPERATOR:0\n"); } - return llvm::ConstantExpr::getIntToPtr( - llvm::ConstantInt::get(CGM.IntPtrTy, Result), CGM.Int8PtrTy); + return llvm::ConstantInt::get(CGM.IntPtrTy, Result); } unsigned char inst = (BLOCK_LAYOUT_OPERATOR << 4) | 0; diff --git a/clang/lib/CodeGen/CGObjCRuntime.h b/clang/lib/CodeGen/CGObjCRuntime.h index 28d88dd10be..9b0706770aa 100644 --- a/clang/lib/CodeGen/CGObjCRuntime.h +++ b/clang/lib/CodeGen/CGObjCRuntime.h @@ -275,11 +275,8 @@ public: const CodeGen::CGBlockInfo &blockInfo) = 0; virtual llvm::Constant *BuildRCBlockLayout(CodeGen::CodeGenModule &CGM, const CodeGen::CGBlockInfo &blockInfo) = 0; - - /// Returns an i8* which points to the byref layout information. virtual llvm::Constant *BuildByrefLayout(CodeGen::CodeGenModule &CGM, QualType T) = 0; - virtual llvm::GlobalVariable *GetClassGlobal(const std::string &Name, bool Weak = false) = 0; diff --git a/clang/test/CodeGenObjCXX/blocks.mm b/clang/test/CodeGenObjCXX/blocks.mm index 63a1b33f355..fd93437ff65 100644 --- a/clang/test/CodeGenObjCXX/blocks.mm +++ b/clang/test/CodeGenObjCXX/blocks.mm @@ -68,18 +68,3 @@ class CaptureThisAndAnotherPointer { takeBlock(^{ useValues(ptr, this); }); } }; - -// rdar://problem/23713871 -// Check that we don't crash when using BLOCK_LAYOUT_STRONG. -#pragma clang assume_nonnull begin -@interface NSUUID @end -#pragma clang assume_nonnull end - -struct Wrapper1 { NSUUID *Ref; }; -struct Wrapper2 { Wrapper1 W1; }; - -@implementation B -- (void) captureStrongRef { - __block Wrapper2 W2; -} -@end |
