summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-03-06 00:37:40 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-03-06 00:37:40 +0000
commit47ef466b0fcd5d8add0d2fd2f2430dee16a03ce5 (patch)
tree2f9dcf25234f7deea7fb6219686cd9e5be384cee /clang/lib
parentda22b30be5376ed9ca2fbc3024b4cc8365843ac4 (diff)
downloadbcm5719-llvm-47ef466b0fcd5d8add0d2fd2f2430dee16a03ce5.tar.gz
bcm5719-llvm-47ef466b0fcd5d8add0d2fd2f2430dee16a03ce5.zip
objective-C: don't crash after diagnosing
using object subscripting without declaring objectForKeyedSubscript: // rdar://13333205 llvm-svn: 176539
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaExpr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index e1b9950ecae..840a71461e2 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -547,7 +547,7 @@ ExprResult Sema::UsualUnaryConversions(Expr *E) {
// First, convert to an r-value.
ExprResult Res = DefaultFunctionArrayLvalueConversion(E);
if (Res.isInvalid())
- return Owned(E);
+ return ExprError();
E = Res.take();
QualType Ty = E->getType();
@@ -598,7 +598,7 @@ ExprResult Sema::DefaultArgumentPromotion(Expr *E) {
ExprResult Res = UsualUnaryConversions(E);
if (Res.isInvalid())
- return Owned(E);
+ return ExprError();
E = Res.take();
// If this is a 'float' or '__fp16' (CVR qualified or typedef) promote to
OpenPOWER on IntegriCloud