summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/lib/CodeGen/CGExprScalar.cpp9
-rw-r--r--clang/test/CodeGenObjC/property-ref-cast-to-void.m18
2 files changed, 25 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 2318cc4e9ae..eb4929d138c 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -1038,8 +1038,13 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) {
return Builder.CreatePtrToInt(Src, ConvertType(DestTy));
}
case CK_ToVoid: {
- if (E->Classify(CGF.getContext()).isGLValue())
- CGF.EmitLValue(E);
+ if (E->Classify(CGF.getContext()).isGLValue()) {
+ LValue LV = CGF.EmitLValue(E);
+ if (LV.isPropertyRef())
+ CGF.EmitLoadOfPropertyRefLValue(LV, E->getType());
+ else if (LV.isKVCRef())
+ CGF.EmitLoadOfKVCRefLValue(LV, E->getType());
+ }
else
CGF.EmitAnyExpr(E, 0, false, true);
return 0;
diff --git a/clang/test/CodeGenObjC/property-ref-cast-to-void.m b/clang/test/CodeGenObjC/property-ref-cast-to-void.m
new file mode 100644
index 00000000000..a365aa56e84
--- /dev/null
+++ b/clang/test/CodeGenObjC/property-ref-cast-to-void.m
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin9 -emit-llvm -o - %s | FileCheck %s
+
+// rdar: // 8399655
+@interface TestClass
+@property (readonly) int myProperty;
+- (int)myProperty;
+- (double)myGetter;
+@end
+
+void FUNC () {
+ TestClass *obj;
+ (void)obj.myProperty;
+ (void)obj.myGetter;
+}
+
+// CHECK: call i32 bitcast
+// CHECK: call double bitcast
OpenPOWER on IntegriCloud