[Sema] Avoid double-diagnosing availability for decl refs.

tshortli · tshortli · commit f6d095de4489 · 2022-01-27T23:56:02.000-08:00
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -3099,7 +3099,8 @@ bool ExprAvailabilityWalker::diagnoseDeclRefAvailability(
       return true;
   }
 
-  diagnoseDeclAvailability(D, R, call, Where, Flags);
+  if (diagnoseDeclAvailability(D, R, call, Where, Flags))
+      return true;
 
   if (R.isValid()) {
     if (diagnoseSubstitutionMapAvailability(R.Start, declRef.getSubstitutions(),

Original file line number	Diff line number	Diff line change
`@@ -3099,7 +3099,8 @@ bool ExprAvailabilityWalker::diagnoseDeclRefAvailability(`
`3099`	`3099`	`return true;`
`3100`	`3100`	`}`
`3101`	`3101`
`3102`		`- diagnoseDeclAvailability(D, R, call, Where, Flags);`
	`3102`	`+ if (diagnoseDeclAvailability(D, R, call, Where, Flags))`
	`3103`	`+ return true;`
`3103`	`3104`
`3104`	`3105`	`if (R.isValid()) {`
`3105`	`3106`	`if (diagnoseSubstitutionMapAvailability(R.Start, declRef.getSubstitutions(),`