Don't hardcode the intrinsic return types twice in the compiler #142405
+7
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @matthewjasper. Use |
rustbot
added
S-waiting-on-review
RalfJung
reviewed
Jun 12, 2025
| .instantiate(self.tcx.tcx, instance.args) | ||
| .output() | ||
| .no_bound_vars() | ||
| .unwrap(); | ||
| let val = self | ||
| .ctfe_query(|tcx| tcx.const_eval_global_id(self.typing_env, gid, tcx.span))?; |
There was a problem hiding this comment.
I feel like ideally the query would return a value+type pair... but that's probably a pretty big refactor.
There was a problem hiding this comment.
oh heh, looking into the query I realized that I went through an overly complex route to get at the type. I'm using the same logic now. Oh nevermind, that just got me a FnDef, not its return type. My original thing was right
Returning the type may be useful in more places, but it may also be a perf regression for just a bit of convenience, we'll have to experiment
|
r=me when CI is happy |
This comment has been minimized.
This comment has been minimized.
|
@bors r=RalfJung |
bors
added
S-waiting-on-bors
|
@bors rollup |
bors
added a commit
that referenced
this pull request
Jun 14, 2025
Rollup of 16 pull requests Successful merges: - #140969 (Allow initializing logger with additional tracing Layer) - #141352 (builtin dyn impl no guide inference) - #142046 (add Vec::peek_mut) - #142273 (tests: Minicore `extern "gpu-kernel"` feature test) - #142302 (Rework how the disallowed qualifier in function type diagnostics are generated) - #142405 (Don't hardcode the intrinsic return types twice in the compiler) - #142434 ( Pre-install JS dependencies in tidy Dockerfile) - #142439 (doc: mention that intrinsics should not be called in user code) - #142441 (Delay replacing escaping bound vars in `FindParamInClause`) - #142449 (Require generic params for const generic params) - #142452 (Remove "intermittent" wording from `ReadDir`) - #142459 (Remove output helper bootstrap) - #142460 (cleanup search graph impl) - #142461 (compiletest: Clarify that `--no-capture` is needed with `--verbose`) - #142475 (Add platform support docs & maintainers for *-windows-msvc) - #142480 (tests: Convert two handwritten minicores to add-core-stubs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 14, 2025
Rollup merge of #142405 - oli-obk:type-once, r=RalfJung Don't hardcode the intrinsic return types twice in the compiler We already manually check intrinsic types in intrinsicck so we don't need to do it in the interpreter
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We already manually check intrinsic types in intrinsicck so we don't need to do it in the interpreter