Merge commit '6db55e07ce09' from apple/main into swift/next

Author: git apple-llvm automerger

mlir/include/mlir/IR/Dominance.h

@@ -45,10 +45,11 @@ class CfgTraits : public llvm::CfgTraits<CfgTraitsBase, CfgTraits> {
 
 } // namespace mlir
 
-template <>
-struct llvm::CfgTraitsFor<mlir::Block> {
+namespace llvm {
+template <> struct CfgTraitsFor<mlir::Block> {
   using CfgTraits = mlir::CfgTraits;
 };
+} // namespace llvm
 
 extern template class llvm::DominatorTreeBase<mlir::Block, false>;
 extern template class llvm::DominatorTreeBase<mlir::Block, true>;