Skip to content

Conversation

RalfJung
Copy link
Member

  • remove the eval_inline_asm hook that @saethlin added; the usage never materialized and he agreed with removing it
  • I tried merging init_alloc_extra and adjust_global_allocation and it didn't work; leave a comment as to why. Also, make the allocation code path a bit more clear by renaming init_alloc_extra to init_local_allocation.

r? @oli-obk

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 12, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 12, 2025

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung RalfJung changed the title minor interpret cleanups minor interpreter cleanups Mar 12, 2025
@oli-obk
Copy link
Contributor

oli-obk commented Mar 12, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 12, 2025

📌 Commit 03c1b43 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 13, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#138126 (Add an opt-out in pretty printing for RTN rendering)
 - rust-lang#138399 (Delegation: allow foreign fns `reuse`)
 - rust-lang#138406 (Update mdbook to 0.4.47)
 - rust-lang#138417 (minor interpreter cleanups)
 - rust-lang#138420 (Adapt to LLVM dropping CfiFunctionIndex::begin()/end())
 - rust-lang#138423 (Don't emit error within cast function, propagate it as a `CastError`)
 - rust-lang#138425 (Remove `feature = "hash_raw_entry"`)
 - rust-lang#138427 (Fix RISC-V VxWorks LLVM target triples)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9339bc6 into rust-lang:master Mar 13, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 13, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 13, 2025
Rollup merge of rust-lang#138417 - RalfJung:interpret-cleanup, r=oli-obk

minor interpreter cleanups

- remove the `eval_inline_asm` hook that `@saethlin` added; the usage never materialized and he agreed with removing it
- I tried merging `init_alloc_extra` and `adjust_global_allocation` and it didn't work; leave a comment as to why. Also, make the allocation code path a bit more clear by renaming `init_alloc_extra` to `init_local_allocation`.

r? `@oli-obk`
@RalfJung RalfJung deleted the interpret-cleanup branch March 17, 2025 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants