From d53f3c864bf94d158a2ae677fe92fd41afaec2f3 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 17 Dec 2010 18:19:06 +0000 Subject: [PATCH] Pass StringRefs by value, for consistency. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122074 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FileSystem.h | 8 +++--- include/llvm/Support/PathV2.h | 28 +++++++++---------- lib/Support/PathV2.cpp | 26 ++++++++--------- .../MBlaze/AsmParser/MBlazeAsmParser.cpp | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index 5263d321532..2a2daaecedf 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -604,10 +604,10 @@ class directory_iterator { directory_entry CurrentEntry; // Platform implementations implement these functions to handle iteration. - friend error_code directory_iterator_construct(directory_iterator& it, - const StringRef &path); - friend error_code directory_iterator_increment(directory_iterator& it); - friend error_code directory_iterator_destruct(directory_iterator& it); + friend error_code directory_iterator_construct(directory_iterator &it, + StringRef path); + friend error_code directory_iterator_increment(directory_iterator &it); + friend error_code directory_iterator_destruct(directory_iterator &it); public: explicit directory_iterator(const Twine &path, error_code &ec) diff --git a/include/llvm/Support/PathV2.h b/include/llvm/Support/PathV2.h index acb66d772af..3866e410e62 100644 --- a/include/llvm/Support/PathV2.h +++ b/include/llvm/Support/PathV2.h @@ -52,8 +52,8 @@ class const_iterator { size_t Position; //< The iterators current position within Path. // An end iterator has Position = Path.size() + 1. - friend const_iterator begin(const StringRef &path); - friend const_iterator end(const StringRef &path); + friend const_iterator begin(StringRef path); + friend const_iterator end(StringRef path); public: typedef const StringRef value_type; @@ -80,24 +80,24 @@ typedef std::reverse_iterator reverse_iterator; /// @brief Get begin iterator over \a path. /// @param path Input path. /// @returns Iterator initialized with the first component of \a path. -const_iterator begin(const StringRef &path); +const_iterator begin(StringRef path); /// @brief Get end iterator over \a path. /// @param path Input path. /// @returns Iterator initialized to the end of \a path. -const_iterator end(const StringRef &path); +const_iterator end(StringRef path); /// @brief Get reverse begin iterator over \a path. /// @param path Input path. /// @returns Iterator initialized with the first reverse component of \a path. -inline reverse_iterator rbegin(const StringRef &path) { +inline reverse_iterator rbegin(StringRef path) { return reverse_iterator(end(path)); } /// @brief Get reverse end iterator over \a path. /// @param path Input path. /// @returns Iterator initialized to the reverse end of \a path. -inline reverse_iterator rend(const StringRef &path) { +inline reverse_iterator rend(StringRef path) { return reverse_iterator(begin(path)); } @@ -175,7 +175,7 @@ void native(const Twine &path, SmallVectorImpl &result); /// /// @param path Input path. /// @result The root name of \a path if it has one, otherwise "". -const StringRef root_name(const StringRef &path); +const StringRef root_name(StringRef path); /// @brief Get root directory. /// @@ -186,7 +186,7 @@ const StringRef root_name(const StringRef &path); /// @param path Input path. /// @result The root directory of \a path if it has one, otherwise /// "". -const StringRef root_directory(const StringRef &path); +const StringRef root_directory(StringRef path); /// @brief Get root path. /// @@ -194,7 +194,7 @@ const StringRef root_directory(const StringRef &path); /// /// @param path Input path. /// @result The root path of \a path if it has one, otherwise "". -const StringRef root_path(const StringRef &path); +const StringRef root_path(StringRef path); /// @brief Get relative path. /// @@ -204,7 +204,7 @@ const StringRef root_path(const StringRef &path); /// /// @param path Input path. /// @result The path starting after root_path if one exists, otherwise "". -const StringRef relative_path(const StringRef &path); +const StringRef relative_path(StringRef path); /// @brief Get parent path. /// @@ -214,7 +214,7 @@ const StringRef relative_path(const StringRef &path); /// /// @param path Input path. /// @result The parent path of \a path if one exists, otherwise "". -const StringRef parent_path(const StringRef &path); +const StringRef parent_path(StringRef path); /// @brief Get filename. /// @@ -226,7 +226,7 @@ const StringRef parent_path(const StringRef &path); /// @param path Input path. /// @result The filename part of \a path. This is defined as the last component /// of \a path. -const StringRef filename(const StringRef &path); +const StringRef filename(StringRef path); /// @brief Get stem. /// @@ -242,7 +242,7 @@ const StringRef filename(const StringRef &path); /// /// @param path Input path. /// @result The stem of \a path. -const StringRef stem(const StringRef &path); +const StringRef stem(StringRef path); /// @brief Get extension. /// @@ -256,7 +256,7 @@ const StringRef stem(const StringRef &path); /// /// @param path Input path. /// @result The extension of \a path. -const StringRef extension(const StringRef &path); +const StringRef extension(StringRef path); /// @brief Has root name? /// diff --git a/lib/Support/PathV2.cpp b/lib/Support/PathV2.cpp index 54522702d1e..2a4c4588a35 100644 --- a/lib/Support/PathV2.cpp +++ b/lib/Support/PathV2.cpp @@ -89,7 +89,7 @@ namespace { return StringRef(); } - size_t filename_pos(const StringRef &str) { + size_t filename_pos(StringRef str) { if (str.size() == 2 && is_separator(str[0]) && str[0] == str[1]) @@ -112,7 +112,7 @@ namespace { return pos + 1; } - size_t root_dir_start(const StringRef &str) { + size_t root_dir_start(StringRef str) { // case "c:/" #ifdef LLVM_ON_WIN32 if (str.size() > 2 && @@ -142,7 +142,7 @@ namespace { return StringRef::npos; } - size_t parent_path_end(const StringRef &path) { + size_t parent_path_end(StringRef path) { size_t end_pos = filename_pos(path); bool filename_was_sep = path.size() > 0 && is_separator(path[end_pos]); @@ -166,7 +166,7 @@ namespace llvm { namespace sys { namespace path { -const_iterator begin(const StringRef &path) { +const_iterator begin(StringRef path) { const_iterator i; i.Path = path; i.Component = find_first_component(path); @@ -174,7 +174,7 @@ const_iterator begin(const StringRef &path) { return i; } -const_iterator end(const StringRef &path) { +const_iterator end(StringRef path) { const_iterator i; i.Path = path; i.Position = path.size(); @@ -279,7 +279,7 @@ ptrdiff_t const_iterator::operator-(const const_iterator &RHS) const { return Position - RHS.Position; } -const StringRef root_path(const StringRef &path) { +const StringRef root_path(StringRef path) { const_iterator b = begin(path), pos = b, e = end(path); @@ -311,7 +311,7 @@ const StringRef root_path(const StringRef &path) { return StringRef(); } -const StringRef root_name(const StringRef &path) { +const StringRef root_name(StringRef path) { const_iterator b = begin(path), e = end(path); if (b != e) { @@ -333,7 +333,7 @@ const StringRef root_name(const StringRef &path) { return StringRef(); } -const StringRef root_directory(const StringRef &path) { +const StringRef root_directory(StringRef path) { const_iterator b = begin(path), pos = b, e = end(path); @@ -362,7 +362,7 @@ const StringRef root_directory(const StringRef &path) { return StringRef(); } -const StringRef relative_path(const StringRef &path) { +const StringRef relative_path(StringRef path) { StringRef root = root_path(path); return StringRef(path.begin() + root.size(), path.size() - root.size()); } @@ -408,7 +408,7 @@ void append(SmallVectorImpl &path, const Twine &a, } } -const StringRef parent_path(const StringRef &path) { +const StringRef parent_path(StringRef path) { size_t end_pos = parent_path_end(path); if (end_pos == StringRef::npos) return StringRef(); @@ -461,11 +461,11 @@ void native(const Twine &path, SmallVectorImpl &result) { #endif } -const StringRef filename(const StringRef &path) { +const StringRef filename(StringRef path) { return *(--end(path)); } -const StringRef stem(const StringRef &path) { +const StringRef stem(StringRef path) { StringRef fname = filename(path); size_t pos = fname.find_last_of('.'); if (pos == StringRef::npos) @@ -478,7 +478,7 @@ const StringRef stem(const StringRef &path) { return StringRef(fname.begin(), pos); } -const StringRef extension(const StringRef &path) { +const StringRef extension(StringRef path) { StringRef fname = filename(path); size_t pos = fname.find_last_of('.'); if (pos == StringRef::npos) diff --git a/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp b/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp index 4fc3b65c83e..7012ab0284c 100644 --- a/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp +++ b/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp @@ -400,7 +400,7 @@ MBlazeOperand *MBlazeAsmParser::ParseRegister() { } } -static unsigned MatchFslRegister(const StringRef &String) { +static unsigned MatchFslRegister(StringRef String) { if (!String.startswith("rfsl")) return -1;