Merge commit '0e823b02ba8a' from llvm.org/main into next

Author: git apple-llvm automerger

libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp

@@ -44,7 +44,12 @@ bool CPlusPlus23(const T& lang_opts)
 }
 
 std::vector<const char*> get_standard_attributes(const clang::LangOptions& lang_opts) {
-  std::vector<const char*> attributes = {"noreturn", "carries_dependency"};
+  std::vector<const char*> attributes;
+
+  if (lang_opts.CPlusPlus11) {
+    attributes.emplace_back("noreturn");
+    attributes.emplace_back("carries_dependency");
+  }
 
   if (lang_opts.CPlusPlus14)
     attributes.emplace_back("deprecated");