From 8eaecfe64f1a1c9c71c2f1aadd224a3b9327e7cc Mon Sep 17 00:00:00 2001
From: Daniel Sanders <daniel_l_sanders@apple.com>
Date: Tue, 4 Apr 2017 13:52:00 +0000
Subject: [PATCH] [globalisel][tablegen] Try to make MSVC happy with r299430

Fix other cases of 'const StringRef' creeping back in at the same time.

This should fix the llvm-clang-x86_64-expensive-checks-win buildbot.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299433 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/TableGen/GlobalISelEmitter.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/TableGen/GlobalISelEmitter.cpp b/utils/TableGen/GlobalISelEmitter.cpp
index 42f26e7e56a..f581c889234 100644
--- a/utils/TableGen/GlobalISelEmitter.cpp
+++ b/utils/TableGen/GlobalISelEmitter.cpp
@@ -118,7 +118,7 @@ public:
 
   static OperandPlaceholder
   CreateMatchReference(InstructionMatcher *InsnMatcher,
-                       const StringRef InsnVarName, const StringRef SymbolicName) {
+                       StringRef InsnVarName, StringRef SymbolicName) {
     OperandPlaceholder Result(OP_MatchReference);
     Result.MatchReference.InsnMatcher = InsnMatcher;
     Result.MatchReference.InsnVarName = InsnVarName;
@@ -281,7 +281,7 @@ public:
   /// InstructionOperandMatcher is the only subclass that can return non-null
   /// for this.
   virtual Optional<const OperandMatcher *>
-  getOptionalOperand(const StringRef SymbolicName) const {
+  getOptionalOperand(StringRef SymbolicName) const {
     assert(!SymbolicName.empty() && "Cannot lookup unnamed operand");
     return None;
   }
@@ -438,7 +438,7 @@ public:
   }
   unsigned getOperandIndex() const { return OpIdx; }
 
-  std::string getOperandExpr(const StringRef InsnVarName) const {
+  std::string getOperandExpr(StringRef InsnVarName) const {
     return (InsnVarName + ".getOperand(" + llvm::to_string(OpIdx) + ")").str();
   }
 
@@ -467,7 +467,7 @@ public:
   /// Emit a C++ expression that tests whether the instruction named in
   /// InsnVarName matches all the predicate and all the operands.
   void emitCxxPredicateExpr(raw_ostream &OS, RuleMatcher &Rule,
-                            const StringRef InsnVarName) const {
+                            StringRef InsnVarName) const {
     OS << "(/* ";
     if (SymbolicName.empty())
       OS << "Operand " << OpIdx;
@@ -632,7 +632,7 @@ public:
     return None;
   }
 
-  const OperandMatcher &getOperand(const StringRef SymbolicName) const {
+  const OperandMatcher &getOperand(StringRef SymbolicName) const {
     Optional<const OperandMatcher *>OM = getOptionalOperand(SymbolicName);
     if (OM.hasValue())
       return *OM.getValue();
-- 
2.11.0