[CSFix] NFC: Fix a bad rebase of invalid static member lookup fix

xedin · xedin · commit 618f5633c00a · 2021-02-23T11:33:11.000-08:00
diff --git a/include/swift/Sema/CSFix.h b/include/swift/Sema/CSFix.h
@@ -2325,6 +2325,8 @@ class AllowInvalidStaticMemberRefOnProtocolMetatype final
     return "allow invalid static member reference on a protocol metatype";
   }
 
+  bool diagnose(const Solution &solution, bool asNote = false) const override;
+
   static AllowInvalidStaticMemberRefOnProtocolMetatype *
   create(ConstraintSystem &cs, ConstraintLocator *locator);
 };

Original file line number	Diff line number	Diff line change
`@@ -2325,6 +2325,8 @@ class AllowInvalidStaticMemberRefOnProtocolMetatype final`
`2325`	`2325`	`return "allow invalid static member reference on a protocol metatype";`
`2326`	`2326`	`}`
`2327`	`2327`
	`2328`	`+ bool diagnose(const Solution &solution, bool asNote = false) const override;`
	`2329`	`+`
`2328`	`2330`	`static AllowInvalidStaticMemberRefOnProtocolMetatype *`
`2329`	`2331`	`create(ConstraintSystem &cs, ConstraintLocator *locator);`
`2330`	`2332`	`};`