diff options
| author | Vedant Kumar <vsk@apple.com> | 2015-12-21 19:30:37 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2015-12-21 19:30:37 +0000 |
| commit | f6a69116df1a959ce374f97fcacbbcbf71dea363 (patch) | |
| tree | 995e52ea5f09dc3edd57a16d420372d921a2f72a /lib/CodeGen/CGObjCRuntime.h | |
| parent | b8cc716acd20e16ef3a8e66d6c561a4971330c0c (diff) | |
[CodeGen] Fix assignments of inline layouts into the byref structure
When using blocks, a byref structure is created to represent the
closure. The "byref.layout" field of this structure is an i8*. However,
some 'inline' layouts are represented as i64's, not i8*'s.
Prior to r246985 we cast the i64 'inline' layout to an i8* before
assigning it into the byref structure. This patch brings the cast back
and adds a regression test.
rdar://23713871
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256185 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjCRuntime.h')
| -rw-r--r-- | lib/CodeGen/CGObjCRuntime.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/CodeGen/CGObjCRuntime.h b/lib/CodeGen/CGObjCRuntime.h index 9b0706770a..28d88dd10b 100644 --- a/lib/CodeGen/CGObjCRuntime.h +++ b/lib/CodeGen/CGObjCRuntime.h @@ -275,8 +275,11 @@ 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; |