Fix const_fn ICE with non-const function pointer #56337
Merged
Conversation
|
r? @oli-obk |
| assert!(!self.tcx.is_const_fn(def_id)); | ||
| match &self.tcx.item_name(def_id).as_str()[..] { | ||
| | "size_of" | ||
| | "min_align_of" |
oli-obk
Nov 29, 2018
Contributor
what happened to the indent here?
what happened to the indent here?
phansch
Nov 29, 2018
Author
Member
vim messing up some indentation apparently ◀️ 🙁
I will add a separate commit to fix it.
vim messing up some indentation apparently
I will add a separate commit to fix it.
| } | ||
| }, | ||
| _ => { | ||
| span_bug!(self.span, "this is not allowed in const fn"); |
oli-obk
Nov 29, 2018
Contributor
I think it would be strictly less ICEy if we just called not_const here and early returned
I think it would be strictly less ICEy if we just called not_const here and early returned
|
I had to rebase from master which was rather complicated, so I opted to re-do this because that was quicker. I added an additional test for |
|
@bors r+ thanks |
|
|
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Nov 30, 2018
Verified
This commit was signed with a verified signature.
Fix const_fn ICE with non-const function pointer Fixes rust-lang#56164
bors
added a commit
that referenced
this pull request
Nov 30, 2018
Rollup of 19 pull requests Successful merges: - #55011 (Add libstd Cargo feature "panic_immediate_abort") - #55821 (Use sort_by_cached_key when the key function is not trivial/free) - #56014 (add test for issue #21335) - #56131 (Assorted tweaks) - #56214 (Implement chalk unification routines) - #56216 (Add TryFrom<&[T]> for [T; $N] where T: Copy) - #56268 (Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.) - #56324 (Use raw_entry for more efficient interning) - #56336 (Clean up and streamline the pretty-printer) - #56337 (Fix const_fn ICE with non-const function pointer) - #56339 (Remove not used option) - #56341 (Rename conversion util; remove duplicate util in librustc_codegen_llvm.) - #56349 (rustc 1.30.0's linker flavor inference is a non-backwards compat change to -Clinker) - #56355 (Add inline attributes and add unit to CommonTypes) - #56360 (Optimize local linkchecker program) - #56364 (Fix panic with outlives in existential type) - #56365 (Stabilize self_struct_ctor feature.) - #56367 (Moved some feature gate tests to correct location) - #56373 (Update books)
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.
Fixes #56164