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

Rollup of 4 pull requests #112420

Merged
merged 9 commits into from
Jun 8, 2023
Merged

Rollup of 4 pull requests #112420

merged 9 commits into from
Jun 8, 2023

Commits on Jun 4, 2023

  1. Use 128 bits for TypeId hash

    - Switch TypeId to 128 bits
    - Hack around the fact that tracing-subscriber dislikes how TypeId is hashed
    - Remove lowering of type_id128 from rustc_codegen_llvm
    - Remove unnecessary `type_id128` intrinsic (just change return type of `type_id`)
    - Only hash the lower 64 bits of the TypeId
    - Reword comment
    thomcc committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    9e5573a View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Configuration menu
    Copy the full SHA
    fd3d2d4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a3cc503 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Configuration menu
    Copy the full SHA
    8efcb28 View commit details
    Browse the repository at this point in the history
  2. Fix typo

    Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
    thomcc and bjorn3 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    b512004 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#109953 - thomcc:thomcc/typeid128, r=WaffleL…

    …apkin
    
    Use 128 bits for TypeId hash
    
    Preliminary/Draft impl of rust-lang/compiler-team#608
    
    Prior art (probably incomplete list)
    - rust-lang#75923
    - rust-lang#95845
    matthiaskrgr committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    8747c0e View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#112333 - Zoxc:try_collect_active_jobs-deadl…

    …ock, r=cjgillot
    
    Don't hold the active queries lock while calling `make_query`
    
    This moves the call to `make_query` outside the parts that holds the active queries lock in `try_collect_active_jobs`. This should help removed the deadlock and borrow panic that has been observed when printing the query stack during an ICE.
    
    cc `@SparrowLii`
    r? `@cjgillot`
    matthiaskrgr committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    4f2e1df View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#112339 - lnicola:proc-macro-srv-feature, r=…

    …Veykril
    
    Fix rust-analyzer proc macro server
    
    The feature now exists on `proc-macro-srv-cli`, and without it the proc macro server will bail rigth out.
    
    CC rust-lang/rust-analyzer#14991
    matthiaskrgr committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    c71daaa View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#112410 - compiler-errors:writeback, r=lcnr

    Do `fix_*_builtin_expr` hacks on the writeback results
    
    During writeback, we do `fix_{scalar,index}_builtin_expr` so that during MIR build we generate built-in MIR instructions instead of method calls for certain built-in arithmetic operations. We do this by checking the types of these built-in operations are scalar types, and remove the method def-id to essentially mark the operation as built-in and not "overloaded".
    
    For lazy norm and the new trait solver, this is a problem, because we don't actually normalize all the types we end up seeing in the typeck results until they're copied over writeback's copy of the typeck results. To fix this, delay these fixup calls until after this normalization has been done.
    
    This doesn't affect the old trait solver, but does simplify the code a bit IMO, since we can remove a few sets of calls to `resolve_vars_if_possible` and some `borrow_mut`s.
    
    r? `@lcnr`
    matthiaskrgr committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    909bfa3 View commit details
    Browse the repository at this point in the history