1 files changed, 13 insertions, 9 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/MoveConstructorInitCheck.cpp b/clang-tools-extra/clang-tidy/misc/MoveConstructorInitCheck.cpp
index b1ec6da74a7..5b2c789a6c8 100644
--- a/clang-tools-extra/clang-tidy/misc/MoveConstructorInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MoveConstructorInitCheck.cpp
@@ -17,15 +17,19 @@ namespace clang {
 namespace tidy {
 
 void MoveConstructorInitCheck::registerMatchers(MatchFinder *Finder) {
-  Finder->addMatcher(
-    constructorDecl(unless(isImplicit()), allOf(
-      isMoveConstructor(),
-      hasAnyConstructorInitializer(
-        ctorInitializer(withInitializer(constructExpr(hasDeclaration(
-          constructorDecl(isCopyConstructor()).bind("ctor")
-        )))).bind("init")
-      )
-    )), this);
+  // Only register the matchers for C++11; the functionality currently does not
+  // provide any benefit to other languages, despite being benign.
+  if (getLangOpts().CPlusPlus11) {
+    Finder->addMatcher(
+      constructorDecl(unless(isImplicit()), allOf(
+        isMoveConstructor(),
+        hasAnyConstructorInitializer(
+          ctorInitializer(withInitializer(constructExpr(hasDeclaration(
+            constructorDecl(isCopyConstructor()).bind("ctor")
+            )))).bind("init")
+          )
+        )), this);
+  }
 }
 
 void MoveConstructorInitCheck::check(const MatchFinder::MatchResult &Result) {