Merge pull request #41231 from nkcsgexi/require-static-in-type

Author: nkcsgexi

lib/Sema/TypeCheckStorage.cpp

@@ -257,16 +257,18 @@ PatternBindingEntryRequest::evaluate(Evaluator &eval,
   llvm::SmallVector<VarDecl *, 2> vars;
   binding->getPattern(entryNumber)->collectVariables(vars);
   bool isReq = false;
+  bool shouldRequireStatic = false;
   if (auto *d = binding->getDeclContext()->getAsDecl()) {
     isReq = isa<ProtocolDecl>(d);
+    shouldRequireStatic = isa<NominalTypeDecl>(d);
   }
   for (auto *sv: vars) {
     bool hasConst = sv->getAttrs().getAttribute<CompileTimeConstAttr>();
     if (!hasConst)
       continue;
     bool hasStatic = StaticSpelling != StaticSpellingKind::None;
     // only static _const let/var is supported
-    if (!hasStatic) {
+    if (shouldRequireStatic && !hasStatic) {
       binding->diagnose(diag::require_static_for_const);
       continue;
     }

test/Sema/const_pass_as_arguments.swift

@@ -71,3 +71,12 @@ class ConstFanClassWrong4: ConstFan {
 	static func giveMeString() -> String { return "" }
 	static _const let v: String = giveMeString() // expected-error {{_const let should be initialized with a compile-time literal}}
 }
+
+_const let globalConst = 3
+
+class ConstFanClassWrong5 {
+	func foo() -> Int {
+		_const let localConst = 3
+		return globalConst + localConst
+	}
+}