Merge commit 'b0dd368d5741' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn

@@ -152,6 +152,7 @@ static_library("Support") {
     "TimeProfiler.cpp",
     "Timer.cpp",
     "ToolOutputFile.cpp",
+    "TrieRawHashMap.cpp",
     "Twine.cpp",
     "TypeSize.cpp",
     "Unicode.cpp",

llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn

@@ -94,6 +94,7 @@ unittest("ADTTests") {
     "StringSetTest.cpp",
     "StringSwitchTest.cpp",
     "TinyPtrVectorTest.cpp",
+    "TrieRawHashMapTest.cpp",
     "TwineTest.cpp",
     "TypeSwitchTest.cpp",
     "TypeTraitsTest.cpp",