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

PlistSupport: make utility functions non-static inline to encourage linker dedup 

llvm-svn: 212494
This commit is contained in:
Alp Toker 2014-07-07 21:57:42 +00:00
parent 665ea71fcd
commit 9b6d8a217f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
clang/include/clang/Basic/PlistSupport.h
View File

@ -19,8 +19,8 @@ namespace clang {
namespace markup { namespace markup {
typedef llvm::DenseMap<FileID, unsigned> FIDMap; typedef llvm::DenseMap<FileID, unsigned> FIDMap;
static inline void AddFID(FIDMap &FIDs, SmallVectorImpl<FileID> &V, inline void AddFID(FIDMap &FIDs, SmallVectorImpl<FileID> &V,
const SourceManager &SM, SourceLocation L) { const SourceManager &SM, SourceLocation L) {
FileID FID = SM.getFileID(SM.getExpansionLoc(L)); FileID FID = SM.getFileID(SM.getExpansionLoc(L));
FIDMap::iterator I = FIDs.find(FID); FIDMap::iterator I = FIDs.find(FID);
if (I != FIDs.end()) if (I != FIDs.end())
@ -29,21 +29,21 @@ static inline void AddFID(FIDMap &FIDs, SmallVectorImpl<FileID> &V,
V.push_back(FID); V.push_back(FID);
} }
static inline unsigned GetFID(const FIDMap &FIDs, const SourceManager &SM, inline unsigned GetFID(const FIDMap &FIDs, const SourceManager &SM,
SourceLocation L) { SourceLocation L) {
FileID FID = SM.getFileID(SM.getExpansionLoc(L)); FileID FID = SM.getFileID(SM.getExpansionLoc(L));
FIDMap::const_iterator I = FIDs.find(FID); FIDMap::const_iterator I = FIDs.find(FID);
assert(I != FIDs.end()); assert(I != FIDs.end());
return I->second; return I->second;
} }
static inline raw_ostream &Indent(raw_ostream &o, const unsigned indent) { inline raw_ostream &Indent(raw_ostream &o, const unsigned indent) {
for (unsigned i = 0; i < indent; ++i) for (unsigned i = 0; i < indent; ++i)
o << ' '; o << ' ';
return o; return o;
} }
static inline raw_ostream &EmitPlistHeader(raw_ostream &o) { inline raw_ostream &EmitPlistHeader(raw_ostream &o) {
static const char *PlistHeader = static const char *PlistHeader =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" " "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" "
@ -52,14 +52,14 @@ static inline raw_ostream &EmitPlistHeader(raw_ostream &o) {
return o << PlistHeader; return o << PlistHeader;
} }
static inline raw_ostream &EmitInteger(raw_ostream &o, int64_t value) { inline raw_ostream &EmitInteger(raw_ostream &o, int64_t value) {
o << "<integer>"; o << "<integer>";
o << value; o << value;
o << "</integer>"; o << "</integer>";
return o; return o;
} }
static inline raw_ostream &EmitString(raw_ostream &o, StringRef s) { inline raw_ostream &EmitString(raw_ostream &o, StringRef s) {
o << "<string>"; o << "<string>";
for (StringRef::const_iterator I = s.begin(), E = s.end(); I != E; ++I) { for (StringRef::const_iterator I = s.begin(), E = s.end(); I != E; ++I) {
char c = *I; char c = *I;
@ -88,10 +88,10 @@ static inline raw_ostream &EmitString(raw_ostream &o, StringRef s) {
return o; return o;
} }
static inline void EmitLocation(raw_ostream &o, const SourceManager &SM, inline void EmitLocation(raw_ostream &o, const SourceManager &SM,
const LangOptions &LangOpts, SourceLocation L, const LangOptions &LangOpts, SourceLocation L,
const FIDMap &FM, unsigned indent, const FIDMap &FM, unsigned indent,
bool extend = false) { bool extend = false) {
FullSourceLoc Loc(SM.getExpansionLoc(L), const_cast<SourceManager &>(SM)); FullSourceLoc Loc(SM.getExpansionLoc(L), const_cast<SourceManager &>(SM));
// Add in the length of the token, so that we cover multi-char tokens. // Add in the length of the token, so that we cover multi-char tokens.
@ -108,9 +108,9 @@ static inline void EmitLocation(raw_ostream &o, const SourceManager &SM,
Indent(o, indent) << "</dict>\n"; Indent(o, indent) << "</dict>\n";
} }
static inline void EmitRange(raw_ostream &o, const SourceManager &SM, inline void EmitRange(raw_ostream &o, const SourceManager &SM,
const LangOptions &LangOpts, CharSourceRange R, const LangOptions &LangOpts, CharSourceRange R,
const FIDMap &FM, unsigned indent) { const FIDMap &FM, unsigned indent) {
Indent(o, indent) << "<array>\n"; Indent(o, indent) << "<array>\n";
EmitLocation(o, SM, LangOpts, R.getBegin(), FM, indent + 1); EmitLocation(o, SM, LangOpts, R.getBegin(), FM, indent + 1);
EmitLocation(o, SM, LangOpts, R.getEnd(), FM, indent + 1, R.isTokenRange()); EmitLocation(o, SM, LangOpts, R.getEnd(), FM, indent + 1, R.isTokenRange());