From: Duncan P. N. Exon Smith Date: Sat, 20 Feb 2016 23:12:51 +0000 (+0000) Subject: Lex: Change HeaderMapImpl::getString() to return StringRef, NFC X-Git-Tag: llvmorg-3.9.0-rc1~13627 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bbfa43a38a7462560dff946ddacbc06e9098fa2;p=platform%2Fupstream%2Fllvm.git Lex: Change HeaderMapImpl::getString() to return StringRef, NFC llvm-svn: 261459 --- diff --git a/clang/include/clang/Lex/HeaderMap.h b/clang/include/clang/Lex/HeaderMap.h index d94c4c1..a969693 100644 --- a/clang/include/clang/Lex/HeaderMap.h +++ b/clang/include/clang/Lex/HeaderMap.h @@ -53,7 +53,7 @@ private: unsigned getEndianAdjustedWord(unsigned X) const; const HMapHeader &getHeader() const; HMapBucket getBucket(unsigned BucketNo) const; - const char *getString(unsigned StrTabIdx) const; + StringRef getString(unsigned StrTabIdx) const; }; /// This class represents an Apple concept known as a 'header map'. To the diff --git a/clang/lib/Lex/HeaderMap.cpp b/clang/lib/Lex/HeaderMap.cpp index 394a51d..afa2631 100644 --- a/clang/lib/Lex/HeaderMap.cpp +++ b/clang/lib/Lex/HeaderMap.cpp @@ -145,7 +145,7 @@ HMapBucket HeaderMapImpl::getBucket(unsigned BucketNo) const { /// getString - Look up the specified string in the string table. If the string /// index is not valid, it returns an empty string. -const char *HeaderMapImpl::getString(unsigned StrTabIdx) const { +StringRef HeaderMapImpl::getString(unsigned StrTabIdx) const { // Add the start of the string table to the idx. StrTabIdx += getEndianAdjustedWord(getHeader().StringsOffset); @@ -175,9 +175,9 @@ LLVM_DUMP_METHOD void HeaderMapImpl::dump() const { HMapBucket B = getBucket(i); if (B.Key == HMAP_EmptyBucketKey) continue; - const char *Key = getString(B.Key); - const char *Prefix = getString(B.Prefix); - const char *Suffix = getString(B.Suffix); + StringRef Key = getString(B.Key); + StringRef Prefix = getString(B.Prefix); + StringRef Suffix = getString(B.Suffix); llvm::dbgs() << " " << i << ". " << Key << " -> '" << Prefix << "' '" << Suffix << "'\n"; }