Skip to content

Replace mismatched delete with swift_cxx_deleteObject #65076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2023

Conversation

etcwilde
Copy link
Member

The allocatedEntry is allocated with swift_cxx_newObject so it should be deallocated with the swift_cxx_deleteObject.

The `allocatedEntry` is allocated with `swift_cxx_newObject` so it
should be deallocated with the `swift_cxx_deleteObject`.
@etcwilde etcwilde requested a review from mikeash April 11, 2023 21:17
@etcwilde
Copy link
Member Author

@swift-ci please test

Copy link
Contributor

@mikeash mikeash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I suspect you prevented a last-minute hair-on-fire emergency in about five years' time.

@etcwilde
Copy link
Member Author

Linux failure:

******************** TEST 'Swift(linux-x86_64) :: SourceKit/Sema/sema_edits.swift' FAILED ********************
Script:
--
: 'RUN: at line 6';   /home/build-user/build/buildbot_linux/swift-linux-x86_64/bin/sourcekitd-test -module-cache-path '/home/build-user/build/buildbot_linux/swift-linux-x86_64/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache' -req=open /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift -- /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift == -req=edit -pos=3:5 -replace="}" -length=0 /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift ==     -req=edit -pos=3:1 -replace="}" -length=5 /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift ==     -req=print-annotations /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift > /home/build-user/build/buildbot_linux/swift-linux-x86_64/test-linux-x86_64/SourceKit/Sema/Output/sema_edits.swift.tmp.response
: 'RUN: at line 9';   diff -u /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift.response /home/build-user/build/buildbot_linux/swift-linux-x86_64/test-linux-x86_64/SourceKit/Sema/Output/sema_edits.swift.tmp.response
--
Exit Code: 134

Command Output (stderr):
--
{
  key.request: source.request.editor.open,
  key.name: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift",
  key.compilerargs: [
    "-module-cache-path",
    "/home/build-user/build/buildbot_linux/swift-linux-x86_64/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache",
    "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift"
  ],
  key.sourcefile: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift",
  key.primary_file: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift"
}
{
  key.request: source.request.editor.replacetext,
  key.name: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift",
  key.compilerargs: [
    "-module-cache-path",
    "/home/build-user/build/buildbot_linux/swift-linux-x86_64/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache"
  ],
  key.offset: 7,
  key.length: 0,
  key.sourcefile: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift",
  key.sourcetext: "}",
  key.primary_file: "/home/build-user/swift/test/SourceKit/Sema/sema_edits.swift"
}
sourcekitd-test: /home/build-user/swift/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp:1560: void getSemanticInfoImplAfterDocUpdate(sourcekitd_variant_t, sourcekitd_variant_t): Assertion `sourcekitd_variant_get_type(sourcekitd_variant_dictionary_get_value( DocUpdate, KeyAnnotations)) == SOURCEKITD_VARIANT_TYPE_NULL' failed.
PLEASE submit a bug report to https://github.com/llvm/llvm-project/issues/ and include the crash backtrace.
/home/build-user/build/buildbot_linux/swift-linux-x86_64/test-linux-x86_64/SourceKit/Sema/Output/sema_edits.swift.script: line 2: 18098 Aborted                 (core dumped) /home/build-user/build/buildbot_linux/swift-linux-x86_64/bin/sourcekitd-test -module-cache-path '/home/build-user/build/buildbot_linux/swift-linux-x86_64/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache' -req=open /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift -- /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift == -req=edit -pos=3:5 -replace="}" -length=0 /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift == -req=edit -pos=3:1 -replace="}" -length=5 /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift == -req=print-annotations /home/build-user/swift/test/SourceKit/Sema/sema_edits.swift > /home/build-user/build/buildbot_linux/swift-linux-x86_64/test-linux-x86_64/SourceKit/Sema/Output/sema_edits.swift.tmp.response

--

@etcwilde
Copy link
Member Author

macOS failure:

Test Suite 'Selected tests' started at 2023-04-12 00:06:29.593Test Suite 'SwiftPMPackageTests.xctest' started at 2023-04-12 00:06:29.593Test Suite 'BuildToolTests' started at 2023-04-12 00:06:29.593Test Case '-[CommandsTests.BuildToolTests testAtMainSupport]' started./Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/swiftpm/Sources/SPMTestSupport/misc.swift:105: error: -[CommandsTests.BuildToolTests testAtMainSupport] : failed: caught error: "terminated(1): /Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/swift-build --package-path /private/var/folders/pf/p5g2vb2j0yx1x6vlmxdppc700000gn/T/Miscellaneous_AtMainSupport.LwpV3W/Miscellaneous_AtMainSupport --product ClangExecSingleFile output:
    error: 'miscellaneous_atmainsupport': Invalid manifest (compiled with: ["/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/toolchain-macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc", "-vfsoverlay", "/var/folders/pf/p5g2vb2j0yx1x6vlmxdppc700000gn/T/TemporaryDirectory.RDu2xg/vfs.yaml", "-L", "/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/lib/swift/pm/ManifestAPI", "-lPackageDescription", "-Xlinker", "-rpath", "-Xlinker", "/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/lib/swift/pm/ManifestAPI", "-target", "x86_64-apple-macosx11.0", "-sdk", "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk", "-F", "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks", "-I", "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/lib", "-L", "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/usr/lib", "-swift-version", "5", "-I", "/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/lib/swift/pm/ManifestAPI", "-sdk", "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk", "-package-description-version", "5.5.0", "-module-cache-path", "/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release", "/private/var/folders/pf/p5g2vb2j0yx1x6vlmxdppc700000gn/T/Miscellaneous_AtMainSupport.LwpV3W/Miscellaneous_AtMainSupport/Package.swift", "-Xfrontend", "-disable-implicit-concurrency-module-import", "-Xfrontend", "-disable-implicit-string-processing-module-import", "-o", "/var/folders/pf/p5g2vb2j0yx1x6vlmxdppc700000gn/T/TemporaryDirectory.httS09/miscellaneous_atmainsupport-manifest"])
    /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk/usr/lib/swift/Foundation.swiftmodule/x86_64-apple-macos.swiftinterface:4:8: error: no such module 'Combine'
    import Combine
           ^
    /private/var/folders/pf/p5g2vb2j0yx1x6vlmxdppc700000gn/T/Miscellaneous_AtMainSupport.LwpV3W/Miscellaneous_AtMainSupport/Package.swift:1:8: error: failed to build module 'Foundation'; this SDK is not supported by the compiler (the SDK is built with 'Apple Swift version 5.5 (swiftlang-1300.0.27.6 clang-1300.0.27.2)', while this compiler is 'Apple Swift version 5.9-dev (LLVM 98bf1bffde60aae, Swift e124ad5f7562f77)'). Please select a toolchain which matches the SDK.
    import Foundation
           ^

@tbkka
Copy link
Contributor

tbkka commented Sep 1, 2023

@swift-ci Please test

@etcwilde etcwilde merged commit 176bf34 into swiftlang:main Sep 2, 2023
@etcwilde etcwilde deleted the ewilde/metadata-cleanup branch September 2, 2023 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants