Merge pull request #68762 from tshortli/fix-serialize-attr-generic-signature-request-decl

tshortli · web-flow · commit 8577c6b0a341 · 2023-09-26T18:37:03.000-07:00
NFC: Correct a declaration in TypeCheckerTypeIDZone.def.
diff --git a/include/swift/AST/TypeCheckRequests.h b/include/swift/AST/TypeCheckRequests.h
@@ -4405,7 +4405,7 @@ class SerializeAttrGenericSignatureRequest
     : public SimpleRequest<SerializeAttrGenericSignatureRequest,
                            GenericSignature(const AbstractFunctionDecl *,
                                             SpecializeAttr *),
-                           RequestFlags::Cached> {
+                           RequestFlags::SeparatelyCached> {
 public:
   using SimpleRequest::SimpleRequest;
 
diff --git a/include/swift/AST/TypeCheckerTypeIDZone.def b/include/swift/AST/TypeCheckerTypeIDZone.def
@@ -501,5 +501,5 @@ SWIFT_REQUEST(TypeChecker, ExpandChildTypeRefinementContextsRequest,
               bool(Decl *, TypeRefinementContext *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, SerializeAttrGenericSignatureRequest,
-              bool(Decl *, SpecializeAttr *),
-              Cached, NoLocationInfo)
+              GenericSignature(Decl *, SpecializeAttr *),
+              SeparatelyCached, NoLocationInfo)
diff --git a/unittests/ClangImporter/CMakeLists.txt b/unittests/ClangImporter/CMakeLists.txt
@@ -8,6 +8,7 @@ add_swift_unittest(SwiftClangImporterTests
 target_link_libraries(SwiftClangImporterTests
     PRIVATE
     swiftClangImporter
+    swiftSema
     swiftParse
     swiftAST
 )
diff --git a/unittests/Driver/CMakeLists.txt b/unittests/Driver/CMakeLists.txt
@@ -7,4 +7,5 @@ add_swift_unittest(SwiftDriverTests
 target_link_libraries(SwiftDriverTests PRIVATE
    swiftAST
    swiftClangImporter
+   swiftSema
    swiftDriver)

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ add_swift_unittest(SwiftClangImporterTests`
`8`	`8`	`target_link_libraries(SwiftClangImporterTests`
`9`	`9`	`PRIVATE`
`10`	`10`	`swiftClangImporter`
	`11`	`+ swiftSema`
`11`	`12`	`swiftParse`
`12`	`13`	`swiftAST`
`13`	`14`	`)`