diff --git a/clang/include/clang/Basic/OpenMPKinds.h b/clang/include/clang/Basic/OpenMPKinds.h
index 121c8bd2e48bf..2621afe7afbb5 100644
--- a/clang/include/clang/Basic/OpenMPKinds.h
+++ b/clang/include/clang/Basic/OpenMPKinds.h
@@ -39,8 +39,7 @@ OpenMPContextSelectorKind getOpenMPContextSelector(llvm::StringRef Str);
 llvm::StringRef getOpenMPContextSelectorName(OpenMPContextSelectorKind Kind);
 
 /// Struct to store the context selectors info.
-template <typename T, typename VectorType, typename ScoreT>
-struct OpenMPCtxSelectorData {
+template <typename VectorType, typename ScoreT> struct OpenMPCtxSelectorData {
   OpenMPContextSelectorSetKind CtxSet = OMP_CTX_SET_unknown;
   OpenMPContextSelectorKind Ctx = OMP_CTX_unknown;
   ScoreT Score;
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 7d8ab59fe9003..55e39a27e6c6a 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -9315,8 +9315,7 @@ class Sema final {
   /// Struct to store the context selectors info for declare variant directive.
   using OMPCtxStringType = SmallString<8>;
   using OMPCtxSelectorData =
-      OpenMPCtxSelectorData<OMPCtxStringType, SmallVector<OMPCtxStringType, 4>,
-                            ExprResult>;
+      OpenMPCtxSelectorData<SmallVector<OMPCtxStringType, 4>, ExprResult>;
 
   /// Checks if the variant/multiversion functions are compatible.
   bool areMultiversionVariantFunctionsCompatible(
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 347606fc74611..c2d895b4ea4a7 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -11028,7 +11028,7 @@ Address CGOpenMPRuntime::getAddressOfLocalVariable(CodeGenFunction &CGF,
 
 namespace {
 using OMPContextSelectorData =
-    OpenMPCtxSelectorData<StringRef, ArrayRef<StringRef>, llvm::APSInt>;
+    OpenMPCtxSelectorData<ArrayRef<StringRef>, llvm::APSInt>;
 using CompleteOMPContextSelectorData = SmallVector<OMPContextSelectorData, 4>;
 } // anonymous namespace