368 changes: 0 additions & 368 deletions clang/include/clang/AST/Expr.h

Large diffs are not rendered by default.

348 changes: 0 additions & 348 deletions clang/include/clang/AST/ExprCXX.h

Large diffs are not rendered by default.

128 changes: 0 additions & 128 deletions clang/include/clang/AST/ExprObjC.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,7 @@ class ObjCStringLiteral : public Expr {
SourceLocation getAtLoc() const { return AtLoc; }
void setAtLoc(SourceLocation L) { AtLoc = L; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return String->getEndLoc(); }

// Iterators
Expand All @@ -102,15 +94,7 @@ class ObjCBoolLiteralExpr : public Expr {
bool getValue() const { return Value; }
void setValue(bool V) { Value = V; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Loc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Loc; }

SourceLocation getLocation() const { return Loc; }
Expand Down Expand Up @@ -157,15 +141,7 @@ class ObjCBoxedExpr : public Expr {

SourceLocation getAtLoc() const { return Range.getBegin(); }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }

SourceRange getSourceRange() const LLVM_READONLY {
Expand Down Expand Up @@ -218,15 +194,7 @@ class ObjCArrayLiteral final
static ObjCArrayLiteral *CreateEmpty(const ASTContext &C,
unsigned NumElements);

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }
SourceRange getSourceRange() const LLVM_READONLY { return Range; }

Expand Down Expand Up @@ -391,15 +359,7 @@ class ObjCDictionaryLiteral final
return DictWithObjectsMethod;
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }
SourceRange getSourceRange() const LLVM_READONLY { return Range; }

Expand Down Expand Up @@ -452,15 +412,7 @@ class ObjCEncodeExpr : public Expr {
EncodedType = EncType;
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RParenLoc; }

// Iterators
Expand Down Expand Up @@ -495,15 +447,7 @@ class ObjCSelectorExpr : public Expr {
void setAtLoc(SourceLocation L) { AtLoc = L; }
void setRParenLoc(SourceLocation L) { RParenLoc = L; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RParenLoc; }

/// getNumArgs - Return the number of actual arguments to this call.
Expand Down Expand Up @@ -552,15 +496,7 @@ class ObjCProtocolExpr : public Expr {
void setAtLoc(SourceLocation L) { AtLoc = L; }
void setRParenLoc(SourceLocation L) { RParenLoc = L; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RParenLoc; }

// Iterators
Expand Down Expand Up @@ -620,17 +556,9 @@ class ObjCIvarRefExpr : public Expr {
SourceLocation getLocation() const { return Loc; }
void setLocation(SourceLocation L) { Loc = L; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return isFreeIvar() ? Loc : getBase()->getBeginLoc();
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Loc; }

SourceLocation getOpLoc() const { return OpLoc; }
Expand Down Expand Up @@ -814,19 +742,11 @@ class ObjCPropertyRefExpr : public Expr {
/// Determine the type of the base, regardless of the kind of receiver.
QualType getReceiverType(const ASTContext &ctx) const;

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return isObjectReceiver() ? getBase()->getBeginLoc()
: getReceiverLocation();
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return IdLoc; }

// Iterators
Expand Down Expand Up @@ -919,18 +839,10 @@ class ObjCSubscriptRefExpr : public Expr {
SourceLocation getRBracket() const { return RBracket; }
void setRBracket(SourceLocation RB) { RBracket = RB; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return SubExprs[BASE]->getBeginLoc();
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RBracket; }

Expr *getBaseExpr() const { return cast<Expr>(SubExprs[BASE]); }
Expand Down Expand Up @@ -1484,15 +1396,7 @@ class ObjCMessageExpr final
RBracLoc = R.getEnd();
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return LBracLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RBracLoc; }

// Iterators
Expand Down Expand Up @@ -1569,10 +1473,6 @@ class ObjCIsaExpr : public Expr {
SourceLocation getOpLoc() const { return OpLoc; }
void setOpLoc(SourceLocation L) { OpLoc = L; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return getBase()->getBeginLoc();
}
Expand All @@ -1581,10 +1481,6 @@ class ObjCIsaExpr : public Expr {
return getBase()->getEndLoc();
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return IsaMemberLoc; }

SourceLocation getExprLoc() const LLVM_READONLY { return IsaMemberLoc; }
Expand Down Expand Up @@ -1654,17 +1550,9 @@ class ObjCIndirectCopyRestoreExpr : public Expr {
child_range children() { return child_range(&Operand, &Operand+1); }

// Source locations are determined by the subexpression.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return Operand->getBeginLoc();
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return Operand->getEndLoc();
}
Expand Down Expand Up @@ -1726,16 +1614,8 @@ class ObjCBridgedCastExpr final
/// The location of the bridge keyword.
SourceLocation getBridgeKeywordLoc() const { return BridgeKeywordLoc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return LParenLoc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return getSubExpr()->getEndLoc();
}
Expand Down Expand Up @@ -1774,15 +1654,7 @@ class ObjCAvailabilityCheckExpr : public Expr {
explicit ObjCAvailabilityCheckExpr(EmptyShell Shell)
: Expr(ObjCAvailabilityCheckExprClass, Shell) {}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const { return RParen; }
SourceRange getSourceRange() const { return {AtLoc, RParen}; }

Expand Down
8 changes: 0 additions & 8 deletions clang/include/clang/AST/ExprOpenMP.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,9 @@ class OMPArraySectionExpr : public Expr {
/// Set length of the array section.
void setLength(Expr *E) { SubExprs[LENGTH] = E; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return getBase()->getBeginLoc();
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return RBracketLoc; }

SourceLocation getColonLoc() const { return ColonLoc; }
Expand Down
8 changes: 0 additions & 8 deletions clang/include/clang/AST/OpenMPClause.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,9 @@ class OMPClause {

public:
/// Returns the starting location of the clause.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const { return StartLoc; }

/// Returns the ending location of the clause.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const { return EndLoc; }

/// Sets the starting location of the clause.
Expand Down
8 changes: 0 additions & 8 deletions clang/include/clang/AST/RawCommentList.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,7 @@ class RawComment {
}

SourceRange getSourceRange() const LLVM_READONLY { return Range; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }

const char *getBriefText(const ASTContext &Context) const {
Expand Down
220 changes: 0 additions & 220 deletions clang/include/clang/AST/Stmt.h

Large diffs are not rendered by default.

48 changes: 0 additions & 48 deletions clang/include/clang/AST/StmtCXX.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,7 @@ class CXXCatchStmt : public Stmt {
CXXCatchStmt(EmptyShell Empty)
: Stmt(CXXCatchStmtClass), ExceptionDecl(nullptr), HandlerBlock(nullptr) {}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return CatchLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return HandlerBlock->getEndLoc();
}
Expand Down Expand Up @@ -94,15 +86,7 @@ class CXXTryStmt final : public Stmt,
static CXXTryStmt *Create(const ASTContext &C, EmptyShell Empty,
unsigned numHandlers);

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return getTryLoc(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}

SourceLocation getTryLoc() const { return TryLoc; }
SourceLocation getEndLoc() const {
Expand Down Expand Up @@ -209,15 +193,7 @@ class CXXForRangeStmt : public Stmt {
SourceLocation getColonLoc() const { return ColonLoc; }
SourceLocation getRParenLoc() const { return RParenLoc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return ForLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return SubExprs[BODY]->getEndLoc();
}
Expand Down Expand Up @@ -303,15 +279,7 @@ class MSDependentExistsStmt : public Stmt {
return reinterpret_cast<CompoundStmt *>(SubStmt);
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return KeywordLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return SubStmt->getEndLoc();
}
Expand Down Expand Up @@ -432,18 +400,10 @@ class CoroutineBodyStmt final
return {getStoredStmts() + SubStmt::FirstParamMove, NumParams};
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return getBody() ? getBody()->getBeginLoc()
: getPromiseDecl()->getBeginLoc();
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return getBody() ? getBody()->getEndLoc() : getPromiseDecl()->getEndLoc();
}
Expand Down Expand Up @@ -505,15 +465,7 @@ class CoreturnStmt : public Stmt {
bool isImplicit() const { return IsImplicit; }
void setIsImplicit(bool value = true) { IsImplicit = value; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return CoreturnLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return getOperand() ? getOperand()->getEndLoc() : getBeginLoc();
}
Expand Down
56 changes: 0 additions & 56 deletions clang/include/clang/AST/StmtObjC.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,7 @@ class ObjCForCollectionStmt : public Stmt {
SourceLocation getRParenLoc() const { return RParenLoc; }
void setRParenLoc(SourceLocation Loc) { RParenLoc = Loc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return ForLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return SubExprs[BODY]->getEndLoc();
}
Expand Down Expand Up @@ -112,15 +104,7 @@ class ObjCAtCatchStmt : public Stmt {
SourceLocation getRParenLoc() const { return RParenLoc; }
void setRParenLoc(SourceLocation Loc) { RParenLoc = Loc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtCatchLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Body->getEndLoc(); }

bool hasEllipsis() const { return getCatchParamDecl() == nullptr; }
Expand Down Expand Up @@ -149,15 +133,7 @@ class ObjCAtFinallyStmt : public Stmt {
Stmt *getFinallyBody() { return AtFinallyStmt; }
void setFinallyBody(Stmt *S) { AtFinallyStmt = S; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtFinallyLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return AtFinallyStmt->getEndLoc();
}
Expand Down Expand Up @@ -262,15 +238,7 @@ class ObjCAtTryStmt : public Stmt {
getStmts()[1 + NumCatchStmts] = S;
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtTryLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY;

static bool classof(const Stmt *T) {
Expand Down Expand Up @@ -327,15 +295,7 @@ class ObjCAtSynchronizedStmt : public Stmt {
}
void setSynchExpr(Stmt *S) { SubStmts[SYNC_EXPR] = S; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtSynchronizedLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return getSynchBody()->getEndLoc();
}
Expand Down Expand Up @@ -369,15 +329,7 @@ class ObjCAtThrowStmt : public Stmt {
SourceLocation getThrowLoc() const LLVM_READONLY { return AtThrowLoc; }
void setThrowLoc(SourceLocation Loc) { AtThrowLoc = Loc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtThrowLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return Throw ? Throw->getEndLoc() : AtThrowLoc;
}
Expand Down Expand Up @@ -405,15 +357,7 @@ class ObjCAutoreleasePoolStmt : public Stmt {
Stmt *getSubStmt() { return SubStmt; }
void setSubStmt(Stmt *S) { SubStmt = S; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return AtLoc; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY {
return SubStmt->getEndLoc();
}
Expand Down
8 changes: 0 additions & 8 deletions clang/include/clang/AST/StmtOpenMP.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,8 @@ class OMPExecutableDirective : public Stmt {
}

/// Returns starting location of directive kind.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const { return StartLoc; }
/// Returns ending location of directive.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const { return EndLoc; }

/// Set starting location of directive kind.
Expand Down
8 changes: 0 additions & 8 deletions clang/include/clang/AST/TypeLoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,6 @@ class TypeLoc {
return SourceRange(getBeginLoc(), getEndLoc());
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}

/// Get the local source range.
SourceRange getLocalSourceRange() const {
Expand Down
4 changes: 0 additions & 4 deletions clang/include/clang/Analysis/CloneDetection.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ class StmtSequence {
/// Returns the start sourcelocation of the first statement in this sequence.
///
/// This method should only be called on a non-empty StmtSequence object.
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getStartLoc() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const;

/// Returns the end sourcelocation of the last statement in this sequence.
Expand Down
24 changes: 0 additions & 24 deletions clang/include/clang/Sema/DeclSpec.h
Original file line number Diff line number Diff line change
Expand Up @@ -505,15 +505,7 @@ class DeclSpec {
const CXXScopeSpec &getTypeSpecScope() const { return TypeScope; }

SourceRange getSourceRange() const LLVM_READONLY { return Range; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }

SourceLocation getTypeSpecWidthLoc() const { return TSWRange.getBegin(); }
Expand Down Expand Up @@ -1128,15 +1120,7 @@ class UnqualifiedId {
SourceRange getSourceRange() const LLVM_READONLY {
return SourceRange(StartLocation, EndLocation);
}
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return StartLocation; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return EndLocation; }
};

Expand Down Expand Up @@ -1886,15 +1870,7 @@ class Declarator {

/// Get the source range that spans this declarator.
SourceRange getSourceRange() const LLVM_READONLY { return Range; }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY { return Range.getBegin(); }
LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return Range.getEnd(); }

void SetSourceRange(SourceRange R) { Range = R; }
Expand Down
4 changes: 0 additions & 4 deletions clang/lib/CodeGen/CoverageMappingGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ class SourceMappingRegion {

void setStartLoc(SourceLocation Loc) { LocStart = Loc; }

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getStartLoc() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const {
assert(LocStart && "Region has no start location");
return *LocStart;
Expand Down
8 changes: 0 additions & 8 deletions clang/lib/Sema/SemaChecking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6145,18 +6145,10 @@ class FormatStringLiteral {
StartToken, StartTokenByteOffset);
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocStart() const LLVM_READONLY,
"Use getBeginLoc instead") {
return getBeginLoc();
}
SourceLocation getBeginLoc() const LLVM_READONLY {
return FExpr->getBeginLoc().getLocWithOffset(Offset);
}

LLVM_ATTRIBUTE_DEPRECATED(SourceLocation getLocEnd() const LLVM_READONLY,
"Use getEndLoc instead") {
return getEndLoc();
}
SourceLocation getEndLoc() const LLVM_READONLY { return FExpr->getEndLoc(); }
};

Expand Down