Merge commit '6ac5047aa6bf' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit d15b70a354f2 · 2024-06-04T18:11:58.000+02:00
diff --git a/flang/lib/Semantics/check-call.cpp b/flang/lib/Semantics/check-call.cpp
@@ -961,7 +961,7 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,
   if ((arg.isPercentRef() || arg.isPercentVal()) &&
       dummy.IsPassedByDescriptor(procedure.IsBindC())) {
     messages.Say(
-        "%VAL or %REF are not allowed for %s that must be passed by means of a descriptor"_err_en_US,
+        "%%VAL or %%REF are not allowed for %s that must be passed by means of a descriptor"_err_en_US,
         dummyName);
   }
   if (arg.isPercentVal() &&

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,7 @@ static void CheckExplicitDataArg(const characteristics::DummyDataObject &dummy,`
`961`	`961`	`if ((arg.isPercentRef() \|\| arg.isPercentVal()) &&`
`962`	`962`	`dummy.IsPassedByDescriptor(procedure.IsBindC())) {`
`963`	`963`	`messages.Say(`
`964`		`- "%VAL or %REF are not allowed for %s that must be passed by means of a descriptor"_err_en_US,`
	`964`	`+ "%%VAL or %%REF are not allowed for %s that must be passed by means of a descriptor"_err_en_US,`
`965`	`965`	`dummyName);`
`966`	`966`	`}`
`967`	`967`	`if (arg.isPercentVal() &&`