Index: utils/TableGen/GlobalISelEmitter.cpp
===================================================================
--- utils/TableGen/GlobalISelEmitter.cpp
+++ utils/TableGen/GlobalISelEmitter.cpp
@@ -994,8 +994,12 @@
     if (OperandIsAPointer)
       addPredicate<PointerToAnyOperandMatcher>(
           OpTyOrNone->get().getSizeInBits());
-    else
-      addPredicate<LLTOperandMatcher>(*OpTyOrNone);
+    else {
+      // The following local variable is not needed but is a workaround for a VS
+      // 2015 Update 3 CL internal error when building RelWithDebInfo.
+      const LLTCodeGen &OpTy = *OpTyOrNone;
+      addPredicate<LLTOperandMatcher>(OpTy);
+    }
     return Error::success();
   }