diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-08-04 17:28:11 +0000 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-08-04 17:28:11 +0000 |
commit | 436bcdd2bdb67511d138c3a67662e11ef1985b62 (patch) | |
tree | 13ff079469418b3e3c4d3efebc244087c546fb6f /lib/Sema/SemaPseudoObject.cpp | |
parent | 7e0b0ec1bbe82f2db8fafb29b4c0eb00acd9786a (diff) |
Fix crash when accessing a property of an invalid interface
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@214735 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaPseudoObject.cpp')
-rw-r--r-- | lib/Sema/SemaPseudoObject.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/Sema/SemaPseudoObject.cpp b/lib/Sema/SemaPseudoObject.cpp index fac7774734..aa3e89ed67 100644 --- a/lib/Sema/SemaPseudoObject.cpp +++ b/lib/Sema/SemaPseudoObject.cpp @@ -284,7 +284,7 @@ namespace { bool tryBuildGetOfReference(Expr *op, ExprResult &result); bool findSetter(bool warn=true); bool findGetter(); - bool DiagnoseUnsupportedPropertyUse(); + void DiagnoseUnsupportedPropertyUse(); Expr *rebuildAndCaptureObject(Expr *syntacticBase) override; ExprResult buildGet() override; @@ -642,7 +642,7 @@ bool ObjCPropertyOpBuilder::findSetter(bool warn) { return false; } -bool ObjCPropertyOpBuilder::DiagnoseUnsupportedPropertyUse() { +void ObjCPropertyOpBuilder::DiagnoseUnsupportedPropertyUse() { if (S.getCurLexicalContext()->isObjCContainer() && S.getCurLexicalContext()->getDeclKind() != Decl::ObjCCategoryImpl && S.getCurLexicalContext()->getDeclKind() != Decl::ObjCImplementation) { @@ -650,10 +650,8 @@ bool ObjCPropertyOpBuilder::DiagnoseUnsupportedPropertyUse() { S.Diag(RefExpr->getLocation(), diag::err_property_function_in_objc_container); S.Diag(prop->getLocation(), diag::note_property_declare); - return true; } } - return false; } /// Capture the base object of an Objective-C property expression. @@ -679,10 +677,10 @@ Expr *ObjCPropertyOpBuilder::rebuildAndCaptureObject(Expr *syntacticBase) { /// Load from an Objective-C property reference. ExprResult ObjCPropertyOpBuilder::buildGet() { findGetter(); - if (!Getter && DiagnoseUnsupportedPropertyUse()) - return ExprError(); - - assert(Getter); + if (!Getter) { + DiagnoseUnsupportedPropertyUse(); + return ExprError(); + } if (SyntacticRefExpr) SyntacticRefExpr->setIsMessagingGetter(); @@ -720,10 +718,10 @@ ExprResult ObjCPropertyOpBuilder::buildGet() { /// value being set as the value of the property operation. ExprResult ObjCPropertyOpBuilder::buildSet(Expr *op, SourceLocation opcLoc, bool captureSetValueAsResult) { - bool hasSetter = findSetter(false); - if (!hasSetter && DiagnoseUnsupportedPropertyUse()) - return ExprError(); - assert(hasSetter); (void) hasSetter; + if (!findSetter(false)) { + DiagnoseUnsupportedPropertyUse(); + return ExprError(); + } if (SyntacticRefExpr) SyntacticRefExpr->setIsMessagingSetter(); |