diff options
| author | Vedant Kumar <vsk@apple.com> | 2015-12-21 20:21:15 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2015-12-21 20:21:15 +0000 |
| commit | 0fa436f61822040fa136b7ce30760a904bef0d5b (patch) | |
| tree | d00aa1eb9623a5faab995941da2f0974566742bc /lib/CodeGen/CGObjCRuntime.h | |
| parent | 3255684968c4a9e935b61678175b0d722df2d094 (diff) | |
Reapply "[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.
The original version of this patch was too invasive. This version only adds the
cast to BuildByrefLayout.
Differential Revision: http://reviews.llvm.org/D15674
rdar://23713871
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256190 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; |