various cleanups
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67981 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h
index f2f81e1..b7bb8d0 100644
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -1025,7 +1025,7 @@
bool Virtual, AccessSpecifier Access,
TypeTy *basetype,
SourceLocation BaseLoc) {
- return 0;
+ return BaseResult();
}
virtual void ActOnBaseSpecifiers(DeclPtrTy ClassDecl, BaseTy **Bases,
@@ -1440,7 +1440,7 @@
SourceLocation selectorLoc,
SourceLocation rbrac,
ExprTy **ArgExprs, unsigned NumArgs) {
- return 0;
+ return ExprResult();
}
// ActOnInstanceMessage - used for both unary and keyword messages.
// ArgExprs is optional - if it is present, the number of expressions
@@ -1449,7 +1449,7 @@
ExprTy *receiver, Selector Sel,
SourceLocation lbrac, SourceLocation selectorLoc, SourceLocation rbrac,
ExprTy **ArgExprs, unsigned NumArgs) {
- return 0;
+ return ExprResult();
}
virtual DeclPtrTy ActOnForwardClassDeclaration(
SourceLocation AtClassLoc,
@@ -1479,7 +1479,7 @@
virtual ExprResult ParseObjCStringLiteral(SourceLocation *AtLocs,
ExprTy **Strings,
unsigned NumStrings) {
- return 0;
+ return ExprResult();
}
virtual ExprResult ParseObjCEncodeExpression(SourceLocation AtLoc,
@@ -1487,7 +1487,7 @@
SourceLocation LParenLoc,
TypeTy *Ty,
SourceLocation RParenLoc) {
- return 0;
+ return ExprResult();
}
virtual ExprResult ParseObjCSelectorExpression(Selector Sel,
@@ -1495,7 +1495,7 @@
SourceLocation SelLoc,
SourceLocation LParenLoc,
SourceLocation RParenLoc) {
- return 0;
+ return ExprResult();
}
virtual ExprResult ParseObjCProtocolExpression(IdentifierInfo *ProtocolId,
@@ -1503,7 +1503,7 @@
SourceLocation ProtoLoc,
SourceLocation LParenLoc,
SourceLocation RParenLoc) {
- return 0;
+ return ExprResult();
}
//===---------------------------- Pragmas -------------------------------===//
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 22e773a..2042cd3 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -760,8 +760,7 @@
for (CXXRecordDecl::base_class_const_iterator Base = RD->bases_begin(),
BaseEnd = RD->bases_end(); Base != BaseEnd; ++Base) {
if (const RecordType *RT = Base->getType()->getAsRecordType()) {
- const CXXRecordDecl *BaseDecl
- = cast<CXXRecordDecl>(RT->getDecl());
+ const CXXRecordDecl *BaseDecl = cast<CXXRecordDecl>(RT->getDecl());
if (BaseDecl && BaseDecl->isAbstract())
Collect(BaseDecl, Methods);
}
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index ce9fe89..bd94f00 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -410,8 +410,10 @@
if (TypedefDecl *OCTD = dyn_cast_or_null<TypedefDecl>(IDecl)) {
const ObjCInterfaceType *OCIT;
OCIT = OCTD->getUnderlyingType()->getAsObjCInterfaceType();
- if (!OCIT)
- return Diag(receiverLoc, diag::err_invalid_receiver_to_message);
+ if (!OCIT) {
+ Diag(receiverLoc, diag::err_invalid_receiver_to_message);
+ return true;
+ }
ClassDecl = OCIT->getDecl();
}
}