summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGObjCRuntime.h
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2015-12-21 19:30:37 +0000
committerVedant Kumar <vsk@apple.com>2015-12-21 19:30:37 +0000
commiteb37ec87e48ea58c2a5555faeafc7968be5738bb (patch)
tree6e3e2d3115cdd40ea4f79b53ea3f86980c082385 /clang/lib/CodeGen/CGObjCRuntime.h
parentb2910ea67e4d796cbed535edee114882691aba55 (diff)
downloadbcm5719-llvm-eb37ec87e48ea58c2a5555faeafc7968be5738bb.tar.gz
bcm5719-llvm-eb37ec87e48ea58c2a5555faeafc7968be5738bb.zip
[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 llvm-svn: 256185
Diffstat (limited to 'clang/lib/CodeGen/CGObjCRuntime.h')
-rw-r--r--clang/lib/CodeGen/CGObjCRuntime.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGObjCRuntime.h b/clang/lib/CodeGen/CGObjCRuntime.h
index 9b0706770aa..28d88dd10be 100644
--- a/clang/lib/CodeGen/CGObjCRuntime.h
+++ b/clang/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;
OpenPOWER on IntegriCloud