lit_to_const: gracefully bubble up type errors.
#69330
Merged
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
Centril
added
beta-nominated
eddyb
reviewed
Feb 20, 2020
Comment on lines
-30
to
+33
| ast::LitKind::ByteStr(ref data) => { | ||
| if let ty::Ref(_, ref_ty, _) = ty.kind { | ||
| match ref_ty.kind { | ||
| ty::Slice(_) => { | ||
| let allocation = Allocation::from_byte_aligned_bytes(data as &Vec<u8>); | ||
| let allocation = tcx.intern_const_alloc(allocation); | ||
| ConstValue::Slice { data: allocation, start: 0, end: data.len() } | ||
| } | ||
| ty::Array(_, _) => { | ||
| let id = tcx.allocate_bytes(data); | ||
| ConstValue::Scalar(Scalar::Ptr(id.into())) | ||
| } | ||
| _ => { | ||
| bug!("bytestring should have type of either &[u8] or &[u8; _], not {}", ty) | ||
| } | ||
| } | ||
| } else { | ||
| bug!("bytestring should have type of either &[u8] or &[u8; _], not {}", ty) | ||
| } | ||
| (ast::LitKind::ByteStr(data), ty::Ref(_, TyS { kind: ty::Slice(_), .. }, _)) => { | ||
| let allocation = Allocation::from_byte_aligned_bytes(data as &Vec<u8>); | ||
| let allocation = tcx.intern_const_alloc(allocation); | ||
| ConstValue::Slice { data: allocation, start: 0, end: data.len() } |
There was a problem hiding this comment.
Reminder to self that reviewing this is best done in "No Whitespace" mode.
eddyb
reviewed
Feb 20, 2020
Comment on lines
148
to
149
| // create a dummy value and continue compiling | ||
| Const::from_bits(self.tcx, 0, self.param_env.and(ty)) |
There was a problem hiding this comment.
@oli-obk This isn't new in this PR but I wonder why this isn't undef or something (I guess that might cause ICEs?). Maybe we need a ty::ConstKind::Err (if we don't have it already)?
There was a problem hiding this comment.
We don't have such an ::Err variant, https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.ConstKind.html.
There was a problem hiding this comment.
Adding one is probably a good idea (but can be done in a separate PR).
eddyb
reviewed
Feb 20, 2020
eddyb
reviewed
Feb 20, 2020
Centril
force-pushed
the
literally-melting-ice
branch
from
f040e15
to
748dd45
Compare
|
📌 Commit 748dd45 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
|
discussed in T-compiler meeting. beta-accepted. |
pnkfelix
added
the
beta-accepted
Merged
Mark-Simulacrum
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Feb 28, 2020
[beta] backports This backports the following PRs: * ci: switch macOS builders to 10.15 #68863 * Backport release notes of 1.41.1 #69468 * Cherry-pick the LLVM fix for #69225 #69450 * `lit_to_const`: gracefully bubble up type errors. #69330 * [beta] bootstrap from 1.41.1 stable #69518 * bootstrap: Configure cmake when building sanitizer runtimes #69104 r? @ghost
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.
Fixes #69310 which was injected by #68118.
r? @pnkfelix @varkor @eddyb
cc @Skinny121