[cfe-commits] r155663 - /cfe/trunk/lib/CodeGen/CGObjC.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Apr 26 16:33:14 2012
New Revision: 155663

URL: http://llvm.org/viewvc/llvm-project?rev=155663&view=rev
Log:
objective-c IRGen. Fixes a getter synthesis bug
where getter type is super class of its property 
type, resulting in an assert. // rdar://11323676

Modified:
    cfe/trunk/lib/CodeGen/CGObjC.cpp

Modified: cfe/trunk/lib/CodeGen/CGObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjC.cpp?rev=155663&r1=155662&r2=155663&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjC.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjC.cpp Thu Apr 26 16:33:14 2012
@@ -859,7 +859,7 @@
     // 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);