Skip to content
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

[DanglingPtr] Cherry-pick upstream build failure fix #26052

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

cdesouza-chromium
Copy link
Collaborator

@cdesouza-chromium cdesouza-chromium commented Oct 16, 2024

I had to spend some significant bysecting this and it turns out rust tools don't support sanitisers, which was breaking the experimental build with dangling pointers.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/b250fcef54d8631d6fc09d1936980fa81ccaf4d0

commit b250fcef54d8631d6fc09d1936980fa81ccaf4d0
Author: danakj <[email protected]>
Date:   Tue Oct 1 17:57:51 2024 +0000

    Disable PA-based features in the Rust host tools toolchain (proc macros)

    If the user explicitly turns on ASAN and use_raw_ptr_asan_unowned_impl
    we don't want to use those in the host tools toolchain. Elsewhere we
    disable ASAN in the toolchain in build/config/sanitizers/sanitizers.gni:
    ```
    if (!is_a_target_toolchain || toolchain_for_rust_host_build_tools) {
      is_asan = false
    ```

    But that leaves use_raw_ptr_asan_unowned_impl on without ASAN which then
    causes GN assertions and badness.

    The rust host tools toolchain should just use default allocators anyway
    so that the proc macro DLLs use the same allocator as the compiler that
    dlopens them.

    Bug: 40212971

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

I had to spend some significant bysecting this and it turns out rust
tools don't support sanitisers, which was breaking the experimental
build with dangling pointers.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/b250fcef54d8631d6fc09d1936980fa81ccaf4d0

commit b250fcef54d8631d6fc09d1936980fa81ccaf4d0
Author: danakj <[email protected]>
Date:   Tue Oct 1 17:57:51 2024 +0000

    Disable PA-based features in the Rust host tools toolchain (proc macros)

    If the user explicitly turns on ASAN and use_raw_ptr_asan_unowned_impl
    we don't want to use those in the host tools toolchain. Elsewhere we
    disable ASAN in the toolchain in build/config/sanitizers/sanitizers.gni:
    ```
    if (!is_a_target_toolchain || toolchain_for_rust_host_build_tools) {
      is_asan = false
    ```

    But that leaves use_raw_ptr_asan_unowned_impl on without ASAN which then
    causes GN assertions and badness.

    The rust host tools toolchain should just use default allocators anyway
    so that the proc macro DLLs use the same allocator as the compiler that
    dlopens them.

    Bug: 40212971
@cdesouza-chromium cdesouza-chromium merged commit 0a86532 into master Oct 17, 2024
18 checks passed
@cdesouza-chromium cdesouza-chromium deleted the cherry-pick-rust-asan-build-failure-fix branch October 17, 2024 13:04
@github-actions github-actions bot added this to the 1.73.x - Nightly milestone Oct 17, 2024
@brave-builds
Copy link
Collaborator

Released in v1.73.22

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