diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2010-10-23 08:44:57 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2010-10-23 08:44:57 +0000 |
| commit | 14bd96571ef6f0e97dc79ec4d01b547d60e8fa68 (patch) | |
| tree | e1c3bb0fecb600c81734f3953e4d665c439141d2 | |
| parent | 61e38285c54d5f3cad610cb421fad1504373e082 (diff) | |
Update remaining attribute macros to new style.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117204 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 2 | ||||
| -rw-r--r-- | lib/Lex/Lexer.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 650308b6dd..b8383c3e58 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -819,7 +819,7 @@ unsigned SourceManager::getInstantiationColumnNumber(SourceLocation Loc, return getColumnNumber(LocInfo.first, LocInfo.second, Invalid); } -static DISABLE_INLINE void +static LLVM_ATTRIBUTE_NOINLINE void ComputeLineNumbers(Diagnostic &Diag, ContentCache *FI, llvm::BumpPtrAllocator &Alloc, const SourceManager &SM, bool &Invalid); diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 519dd82285..ad3d35af6b 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -585,10 +585,8 @@ static inline bool isNumberBody(unsigned char c) { /// lexer buffer was all instantiated at a single point, perform the mapping. /// This is currently only used for _Pragma implementation, so it is the slow /// path of the hot getSourceLocation method. Do not allow it to be inlined. -static DISABLE_INLINE SourceLocation GetMappedTokenLoc(Preprocessor &PP, - SourceLocation FileLoc, - unsigned CharNo, - unsigned TokLen); +static LLVM_ATTRIBUTE_NOINLINE SourceLocation GetMappedTokenLoc( + Preprocessor &PP, SourceLocation FileLoc, unsigned CharNo, unsigned TokLen); static SourceLocation GetMappedTokenLoc(Preprocessor &PP, SourceLocation FileLoc, unsigned CharNo, unsigned TokLen) { |