Merge commit '285ec53730ce' from llvm.org/main into next

(cherry picked from commit eb88237)

Author: git apple-llvm automerger

llvm/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template renamed to clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template

@@ -1,7 +1,7 @@
 [
   {
     "directory": "DIR",
-    "command": "clang -c DIR/tu.c -fmodules -target i386-apple-ios14.0-simulator -o DIR/tu.o",
+    "command": "clang -c DIR/tu.c -fmodules -target i386-apple-ios14.0-simulator -Wno-error=invalid-ios-deployment-target -o DIR/tu.o",
     "file": "DIR/tu.c"
   }
 ]

llvm/clang/test/ClangScanDeps/Inputs/diagnostics/mod.h renamed to clang/test/ClangScanDeps/Inputs/diagnostics/mod.h

@@ -6,8 +6,9 @@
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full 2>&1 >> %t/result.json
 // RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck %s
 
-// Check that the scanner injects '-Wno-error' option and invalid command-line
-// arguments like '-target i386-apple-ios14.0-simulator' do not result in error.
+// Check that the '-Wno-error=invalid-ios-deployment-target' option is being
+// respected and invalid arguments like '-target i386-apple-ios14.0-simulator'
+// do not result in an error.
 
 // CHECK-NOT:  error:
 // CHECK:      -[[PREFIX:.*]]