diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-04-26 21:33:14 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-04-26 21:33:14 +0000 |
| commit | 0ec8fbe8fa9ca0cacaa5298cab7b32dbfb0ecb3f (patch) | |
| tree | d4a379eef08950f8e5a8c4016d5e77ae3cce60cf /clang/lib/CodeGen/CGObjC.cpp | |
| parent | ac0350a396727fe27436a5b52a53943cfa5bb13f (diff) | |
| download | bcm5719-llvm-0ec8fbe8fa9ca0cacaa5298cab7b32dbfb0ecb3f.tar.gz bcm5719-llvm-0ec8fbe8fa9ca0cacaa5298cab7b32dbfb0ecb3f.zip | |
objective-c IRGen. Fixes a getter synthesis bug
where getter type is super class of its property
type, resulting in an assert. // rdar://11323676
llvm-svn: 155663
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index fc274a93a8a..a10822b7576 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -859,7 +859,7 @@ CodeGenFunction::generateObjCGetterBody(const ObjCImplementationDecl *classImpl, // always objects so we don't need to worry about complex or // aggregates. RV = RValue::get(Builder.CreateBitCast(RV.getScalarVal(), - getTypes().ConvertType(propType))); + getTypes().ConvertType(getterMethod->getResultType()))); EmitReturnOfRValue(RV, propType); |
