maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove some remnants of OwningExprResult / OwningStmtResult. 

These got deleted late 2010 during the Actions/Sema unification.
No functionality change.

llvm-svn: 171269
This commit is contained in:
Nico Weber 2012-12-31 00:28:03 +00:00
parent a48b6c2bba
commit a7c7e60764
2 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/Parse/Parser.h
View File

@ -223,15 +223,6 @@ public:
typedef llvm::MutableArrayRef<Stmt*> MultiStmtArg;
typedef Sema::FullExprArg FullExprArg;
/// Adorns a ExprResult with Actions to make it an ExprResult
ExprResult Owned(ExprResult res) {
return ExprResult(res);
}
/// Adorns a StmtResult with Actions to make it an StmtResult
StmtResult Owned(StmtResult res) {
return StmtResult(res);
}
ExprResult ExprError() { return ExprResult(true); }
StmtResult StmtError() { return StmtResult(true); }

37
clang/lib/Parse/ParseObjc.cpp
View File

@ -2589,8 +2589,8 @@ ExprResult Parser::ParseObjCStringLiteral(SourceLocation AtLoc) {
AtStrings.push_back(Lit.release());
}
return Owned(Actions.ParseObjCStringLiteral(&AtLocs[0], AtStrings.data(),
AtStrings.size()));
return Actions.ParseObjCStringLiteral(&AtLocs[0], AtStrings.data(),
AtStrings.size());
}
/// ParseObjCBooleanLiteral -
@ -2613,7 +2613,7 @@ ExprResult Parser::ParseObjCCharacterLiteral(SourceLocation AtLoc) {
return Lit;
}
ConsumeToken(); // Consume the literal token.
return Owned(Actions.BuildObjCNumericLiteral(AtLoc, Lit.take()));
return Actions.BuildObjCNumericLiteral(AtLoc, Lit.take());
}
/// ParseObjCNumericLiteral -
@ -2627,7 +2627,7 @@ ExprResult Parser::ParseObjCNumericLiteral(SourceLocation AtLoc) {
return Lit;
}
ConsumeToken(); // Consume the literal token.
return Owned(Actions.BuildObjCNumericLiteral(AtLoc, Lit.take()));
return Actions.BuildObjCNumericLiteral(AtLoc, Lit.take());
}
/// ParseObjCBoxedExpr -
@ -2651,8 +2651,8 @@ Parser::ParseObjCBoxedExpr(SourceLocation AtLoc) {
// a boxed expression from a literal.
SourceLocation LPLoc = T.getOpenLocation(), RPLoc = T.getCloseLocation();
ValueExpr = Actions.ActOnParenExpr(LPLoc, RPLoc, ValueExpr.take());
return Owned(Actions.BuildObjCBoxedExpr(SourceRange(AtLoc, RPLoc),
ValueExpr.take()));
return Actions.BuildObjCBoxedExpr(SourceRange(AtLoc, RPLoc),
ValueExpr.take());
}
ExprResult Parser::ParseObjCArrayLiteral(SourceLocation AtLoc) {
@ -2685,7 +2685,7 @@ ExprResult Parser::ParseObjCArrayLiteral(SourceLocation AtLoc) {
}
SourceLocation EndLoc = ConsumeBracket(); // location of ']'
MultiExprArg Args(ElementExprs);
return Owned(Actions.BuildObjCArrayLiteral(SourceRange(AtLoc, EndLoc), Args));
return Actions.BuildObjCArrayLiteral(SourceRange(AtLoc, EndLoc), Args);
}
ExprResult Parser::ParseObjCDictionaryLiteral(SourceLocation AtLoc) {
@ -2741,9 +2741,8 @@ ExprResult Parser::ParseObjCDictionaryLiteral(SourceLocation AtLoc) {
SourceLocation EndLoc = ConsumeBrace();
// Create the ObjCDictionaryLiteral.
return Owned(Actions.BuildObjCDictionaryLiteral(SourceRange(AtLoc, EndLoc),
Elements.data(),
Elements.size()));
return Actions.BuildObjCDictionaryLiteral(SourceRange(AtLoc, EndLoc),
Elements.data(), Elements.size());
}
/// objc-encode-expression:
@ -2767,9 +2766,8 @@ Parser::ParseObjCEncodeExpression(SourceLocation AtLoc) {
if (Ty.isInvalid())
return ExprError();
return Owned(Actions.ParseObjCEncodeExpression(AtLoc, EncLoc,
T.getOpenLocation(), Ty.get(),
T.getCloseLocation()));
return Actions.ParseObjCEncodeExpression(AtLoc, EncLoc, T.getOpenLocation(),
Ty.get(), T.getCloseLocation());
}
/// objc-protocol-expression
@ -2792,10 +2790,9 @@ Parser::ParseObjCProtocolExpression(SourceLocation AtLoc) {
T.consumeClose();
return Owned(Actions.ParseObjCProtocolExpression(protocolId, AtLoc, ProtoLoc,
T.getOpenLocation(),
ProtoIdLoc,
T.getCloseLocation()));
return Actions.ParseObjCProtocolExpression(protocolId, AtLoc, ProtoLoc,
T.getOpenLocation(), ProtoIdLoc,
T.getCloseLocation());
}
/// objc-selector-expression
@ -2856,9 +2853,9 @@ ExprResult Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) {
}
T.consumeClose();
Selector Sel = PP.getSelectorTable().getSelector(nColons, &KeyIdents[0]);
return Owned(Actions.ParseObjCSelectorExpression(Sel, AtLoc, SelectorLoc,
T.getOpenLocation(),
T.getCloseLocation()));
return Actions.ParseObjCSelectorExpression(Sel, AtLoc, SelectorLoc,
T.getOpenLocation(),
T.getCloseLocation());
}
void Parser::ParseLexedObjCMethodDefs(LexedMethod &LM, bool parseMethod) {