Basic: Simplify getClangRepositoryPath and getClangRevision.
- I don't like returning StringRef's ever, unless it is actually important for
performance, which it isn't here.
- Also, stop validating getClangRevision to be an integer, I don't see a good
reason to do this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115071 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/Makefile b/lib/Basic/Makefile
index 7dd5221..61accba 100644
--- a/lib/Basic/Makefile
+++ b/lib/Basic/Makefile
@@ -16,9 +16,11 @@
include $(CLANG_LEVEL)/Makefile
-SVN_REVISION := $(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..)
+SVN_REVISION := $(strip \
+ $(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..))
-SVN_REPOSITORY := $(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath $(PROJ_SRC_DIR)/../..)
+SVN_REPOSITORY := $(strip \
+ $(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath $(PROJ_SRC_DIR)/../..))
CPP.Defines += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include \
-DSVN_REVISION='"$(SVN_REVISION)"' -DSVN_REPOSITORY='"$(SVN_REPOSITORY)"'
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp
index e9649e2..900b3e3 100644
--- a/lib/Basic/Version.cpp
+++ b/lib/Basic/Version.cpp
@@ -20,44 +20,37 @@
namespace clang {
-llvm::StringRef getClangRepositoryPath() {
+std::string getClangRepositoryPath() {
#ifdef SVN_REPOSITORY
- if (SVN_REPOSITORY[0] != '\0') {
- static const char URL[] = SVN_REPOSITORY;
- const char *URLEnd = URL + strlen(URL) - 1;
-
- // Strip off version from a build from an integration branch.
- const char *End = strstr(URL, "/src/tools/clang");
- if (End)
- URLEnd = End;
-
- const char *Begin = strstr(URL, "cfe/");
- if (Begin)
- return llvm::StringRef(Begin + 4, URLEnd - Begin - 4);
-
- return llvm::StringRef(URL, URLEnd - URL);
- }
+ llvm::StringRef URL(SVN_REPOSITORY);
+#else
+ llvm::StringRef URL("");
#endif
- return "";
+
+ // Strip off version from a build from an integration branch.
+ URL = URL.slice(0, URL.find("/src/tools/clang"));
+
+ // Trim path prefix off, assuming path came from standard cfe path.
+ size_t Start = URL.find("cfe/");
+ if (Start != llvm::StringRef::npos)
+ URL = URL.substr(Start + 4);
+
+ return URL;
}
-llvm::StringRef getClangRevision() {
+std::string getClangRevision() {
#ifdef SVN_REVISION
- if (SVN_REVISION[0] != '\0') {
- std::string revision;
- llvm::raw_string_ostream OS(revision);
- OS << strtol(SVN_REVISION, 0, 10);
- return OS.str();
- }
-#endif
+ return SVN_REVISION;
+#else
return "";
+#endif
}
std::string getClangFullRepositoryVersion() {
std::string buf;
llvm::raw_string_ostream OS(buf);
- const llvm::StringRef &Path = getClangRepositoryPath();
- const llvm::StringRef &Revision = getClangRevision();
+ std::string Path = getClangRepositoryPath();
+ std::string Revision = getClangRevision();
if (!Path.empty())
OS << Path;
if (!Revision.empty()) {