diff options
| -rw-r--r-- | lib/Basic/Version.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/PCHReader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index 0c81fdd075..434ddf3f57 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp @@ -55,7 +55,7 @@ std::string getClangFullRepositoryVersion() { std::string buf; llvm::raw_string_ostream OS(buf); OS << getClangRepositoryPath(); - llvm::StringRef Revision = getClangRevision(); + const std::string &Revision = getClangRevision(); if (!Revision.empty()) OS << ' ' << Revision; return buf; diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index f6f4a78c13..a878df7840 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1414,9 +1414,9 @@ PCHReader::ReadPCHBlock() { break; case pch::VERSION_CONTROL_BRANCH_REVISION: { - llvm::StringRef CurBranch = getClangFullRepositoryVersion(); + const std::string &CurBranch = getClangFullRepositoryVersion(); llvm::StringRef PCHBranch(BlobStart, BlobLen); - if (CurBranch != PCHBranch) { + if (llvm::StringRef(CurBranch) != PCHBranch) { Diag(diag::warn_pch_different_branch) << PCHBranch << CurBranch; return IgnorePCH; } |