Skip to content

[Cherry-pick into stable/20230725] Update testcases for upstream Makefile.rules change that removed TRIPLE #7635

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

Conversation

adrian-prantl
Copy link

commit 70d531958bfcdc2f3b92e8c893aa35b5e783ca9f
Author: Adrian Prantl <[email protected]>
Date:   Mon Oct 16 14:45:07 2023 -0700

    Update testcases for upstream Makefile.rules change that removed TRIPLE
    
    The variable was removed in https://reviews.llvm.org/D85539

commit 51b0973ab39bc1d0ffe97432b49ff6b618cce369
Author: Adrian Prantl <[email protected]>
Date:   Mon Oct 16 14:46:44 2023 -0700

    Rename test for consistency

commit 88cc67d7e66091e2730b6772cf3e6df7ad94192f
Author: Adrian Prantl <[email protected]>
Date:   Mon Oct 16 15:18:10 2023 -0700

    Don't update the triple when loading additional dylibs in the expression evaluator
    
    This is a surgical fix for the 5.9 branch to address a design
    problem. When a new Swift module is imported in the expression
    evaluator, LLDB deserialized the compiler invocation from it and the
    way the code was written it replaced the existing compiler invocation
    instead of just adding additional search paths. This patch fixes this
    by adding a paths-only mode that uses a temporary compiler invocation
    object.
    
    rdar://115747362

(cherry picked from commit 51b0973)
…ion evaluator

This is a surgical fix for the 5.9 branch to address a design
problem. When a new Swift module is imported in the expression
evaluator, LLDB deserialized the compiler invocation from it and the
way the code was written it replaced the existing compiler invocation
instead of just adding additional search paths. This patch fixes this
by adding a paths-only mode that uses a temporary compiler invocation
object.

rdar://115747362
(cherry picked from commit 88cc67d)
@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl adrian-prantl merged commit 17bd0c7 into swiftlang:stable/20230725 Oct 17, 2023
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.

1 participant