Merge pull request #68371 from hamishknight/fix-leak-5.9

[5.9] Fix 5.9 LSAN leak

Author: hamishknight

lib/ASTGen/Sources/ASTGen/Diagnostics.swift

@@ -444,7 +444,7 @@ public func addQueuedDiagnostic(
 
 /// Render the queued diagnostics into a UTF-8 string.
 @_cdecl("swift_ASTGen_renderQueuedDiagnostics")
-public func renterQueuedDiagnostics(
+public func renderQueuedDiagnostics(
   queuedDiagnosticsPtr: UnsafeMutablePointer<UInt8>,
   contextSize: Int,
   colorize: Int,

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -167,6 +167,11 @@ func allocateUTF8String(
   }
 }
 
+@_cdecl("swift_ASTGen_freeString")
+public func freeString(pointer: UnsafePointer<UInt8>?) {
+  pointer?.deallocate()
+}
+
 /// Diagnostics produced here.
 enum ASTGenMacroDiagnostic: DiagnosticMessage, FixItMessage {
   case thrownError(Error)
@@ -410,6 +415,14 @@ func checkMacroDefinition(
   }
 }
 
+@_cdecl("swift_ASTGen_freeExpansionReplacements")
+public func freeExpansionReplacements(
+  pointer: UnsafeMutablePointer<Int>?,
+  numReplacements: Int
+) {
+  UnsafeMutableBufferPointer(start: pointer, count: numReplacements).deallocate()
+}
+
 // Make an expansion result for '@_cdecl' function caller.
 func makeExpansionOutputResult(
   expandedSource: String?,

lib/Frontend/PrintingDiagnosticConsumer.cpp

@@ -54,6 +54,7 @@ extern "C" void swift_ASTGen_addQueuedDiagnostic(
 extern "C" void swift_ASTGen_renderQueuedDiagnostics(
     void *queued, ptrdiff_t contextSize, ptrdiff_t colorize,
     char **outBuffer, ptrdiff_t *outBufferLength);
+extern "C" void swift_ASTGen_freeString(const char *str);
 
 // FIXME: Hack because we cannot easily get to the already-parsed source
 // file from here. Fix this egregious oversight!
@@ -1198,6 +1199,7 @@ void PrintingDiagnosticConsumer::flush(bool includeTrailingBreak) {
         &renderedString, &renderedStringLen);
     if (renderedString) {
       Stream.write(renderedString, renderedStringLen);
+      swift_ASTGen_freeString(renderedString);
     }
     swift_ASTGen_destroyQueuedDiagnostics(queuedDiagnostics);
     queuedDiagnostics = nullptr;

lib/Sema/TypeCheckMacros.cpp

@@ -49,6 +49,8 @@ using namespace swift;
 extern "C" void *swift_ASTGen_resolveMacroType(const void *macroType);
 extern "C" void swift_ASTGen_destroyMacro(void *macro);
 
+extern "C" void swift_ASTGen_freeString(const char *str);
+
 extern "C" void *swift_ASTGen_resolveExecutableMacro(
     const char *moduleName, ptrdiff_t moduleNameLength,
     const char *typeName, ptrdiff_t typeNameLength,
@@ -64,6 +66,9 @@ extern "C" ptrdiff_t swift_ASTGen_checkMacroDefinition(
     ptrdiff_t **replacementsPtr,
     ptrdiff_t *numReplacements
 );
+extern "C" void swift_ASTGen_freeExpansionReplacements(
+    ptrdiff_t *replacementsPtr,
+    ptrdiff_t numReplacements);
 
 extern "C" ptrdiff_t swift_ASTGen_expandFreestandingMacro(
     void *diagEngine, void *macro, uint8_t externalKind,
@@ -197,8 +202,8 @@ MacroDefinition MacroDefinitionRequest::evaluate(
 
   // Clean up after the call.
   SWIFT_DEFER {
-    free(externalMacroNamePtr);
-    free(replacements);
+    swift_ASTGen_freeString(externalMacroNamePtr);
+    swift_ASTGen_freeExpansionReplacements(replacements, numReplacements);
   };
 
   if (checkResult < 0 && ctx.CompletionCallback) {
@@ -1054,7 +1059,7 @@ evaluateFreestandingMacro(FreestandingMacroExpansion *expansion,
     evaluatedSource = llvm::MemoryBuffer::getMemBufferCopy(
         {evaluatedSourceAddress, (size_t)evaluatedSourceLength},
         adjustMacroExpansionBufferName(*discriminator));
-    free((void *)evaluatedSourceAddress);
+    swift_ASTGen_freeString(evaluatedSourceAddress);
     break;
 #else
     ctx.Diags.diagnose(loc, diag::macro_unsupported);
@@ -1333,7 +1338,7 @@ static SourceFile *evaluateAttachedMacro(MacroDecl *macro, Decl *attachedTo,
     evaluatedSource = llvm::MemoryBuffer::getMemBufferCopy(
         {evaluatedSourceAddress, (size_t)evaluatedSourceLength},
         adjustMacroExpansionBufferName(*discriminator));
-    free((void *)evaluatedSourceAddress);
+    swift_ASTGen_freeString(evaluatedSourceAddress);
     break;
 #else
     attachedTo->diagnose(diag::macro_unsupported);