From 64e462dff03492c586be0349ec6aa3ad5cd92720 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 16 Mar 2010 20:53:17 +0000 Subject: [PATCH] Update get*LineNumber() and get*ColumnNumber() functions to pass the Invalid bit through; there are no safety-critical callers of these functions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98674 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/SourceLocation.h | 8 ++++---- lib/Basic/SourceLocation.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h index 5b7f877200..f7ea331e1c 100644 --- a/include/clang/Basic/SourceLocation.h +++ b/include/clang/Basic/SourceLocation.h @@ -200,11 +200,11 @@ public: FullSourceLoc getInstantiationLoc() const; FullSourceLoc getSpellingLoc() const; - unsigned getInstantiationLineNumber() const; - unsigned getInstantiationColumnNumber() const; + unsigned getInstantiationLineNumber(bool *Invalid = 0) const; + unsigned getInstantiationColumnNumber(bool *Invalid = 0) const; - unsigned getSpellingLineNumber() const; - unsigned getSpellingColumnNumber() const; + unsigned getSpellingLineNumber(bool *Invalid = 0) const; + unsigned getSpellingColumnNumber(bool *Invalid = 0) const; const char *getCharacterData(bool *Invalid = 0) const; diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp index 5ccd73171e..7412b95560 100644 --- a/lib/Basic/SourceLocation.cpp +++ b/lib/Basic/SourceLocation.cpp @@ -80,24 +80,24 @@ FullSourceLoc FullSourceLoc::getSpellingLoc() const { return FullSourceLoc(SrcMgr->getSpellingLoc(*this), *SrcMgr); } -unsigned FullSourceLoc::getInstantiationLineNumber() const { +unsigned FullSourceLoc::getInstantiationLineNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getInstantiationLineNumber(*this); + return SrcMgr->getInstantiationLineNumber(*this, Invalid); } -unsigned FullSourceLoc::getInstantiationColumnNumber() const { +unsigned FullSourceLoc::getInstantiationColumnNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getInstantiationColumnNumber(*this); + return SrcMgr->getInstantiationColumnNumber(*this, Invalid); } -unsigned FullSourceLoc::getSpellingLineNumber() const { +unsigned FullSourceLoc::getSpellingLineNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getSpellingLineNumber(*this); + return SrcMgr->getSpellingLineNumber(*this, Invalid); } -unsigned FullSourceLoc::getSpellingColumnNumber() const { +unsigned FullSourceLoc::getSpellingColumnNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getSpellingColumnNumber(*this); + return SrcMgr->getSpellingColumnNumber(*this, Invalid); } bool FullSourceLoc::isInSystemHeader() const { -- 2.40.0