Index: include/llvm/Support/FormatProviders.h
===================================================================
--- include/llvm/Support/FormatProviders.h
+++ include/llvm/Support/FormatProviders.h
@@ -46,7 +46,8 @@
 template <typename T>
 struct use_string_formatter
     : public std::integral_constant<
-          bool, is_one_of<T, llvm::StringRef, std::string>::value ||
+          bool, is_one_of<T, llvm::StringRef, llvm::StringLiteral,
+                          std::string>::value ||
                     is_cstring<T>::value> {};
 
 template <typename T>
Index: unittests/Support/FormatVariadicTest.cpp
===================================================================
--- unittests/Support/FormatVariadicTest.cpp
+++ unittests/Support/FormatVariadicTest.cpp
@@ -324,11 +324,13 @@
   const char FooArray[] = "FooArray";
   const char *FooPtr = "FooPtr";
   llvm::StringRef FooRef("FooRef");
+  constexpr StringLiteral FooLiteral("FooLiteral");
   std::string FooString("FooString");
   // 1. Test that we can print various types of strings.
   EXPECT_EQ(FooArray, formatv("{0}", FooArray).str());
   EXPECT_EQ(FooPtr, formatv("{0}", FooPtr).str());
   EXPECT_EQ(FooRef, formatv("{0}", FooRef).str());
+  EXPECT_EQ(FooLiteral, formatv("{0}", FooLiteral).str());
   EXPECT_EQ(FooString, formatv("{0}", FooString).str());
 
   // 2. Test that the precision specifier prints the correct number of