Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit b8fbc7f28f50 · 2022-01-14T00:32:44.000-08:00
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -831,6 +831,10 @@ std::string ASTMangler::mangleOpaqueTypeDecl(const OpaqueTypeDecl *decl) {
 }
 
 std::string ASTMangler::mangleOpaqueTypeDecl(const ValueDecl *decl) {
+#if SWIFT_BUILD_ONLY_SYNTAXPARSERLIB
+  return std::string(); // not needed for the parser library.
+#endif
+
   OptimizeProtocolNames = false;
 
   beginMangling();

Original file line number	Diff line number	Diff line change
`@@ -831,6 +831,10 @@ std::string ASTMangler::mangleOpaqueTypeDecl(const OpaqueTypeDecl *decl) {`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`std::string ASTMangler::mangleOpaqueTypeDecl(const ValueDecl *decl) {`
	`834`	`+#if SWIFT_BUILD_ONLY_SYNTAXPARSERLIB`
	`835`	`+ return std::string(); // not needed for the parser library.`
	`836`	`+#endif`
	`837`	`+`
`834`	`838`	`OptimizeProtocolNames = false;`
`835`	`839`
`836`	`840`	`beginMangling();`