Refactorings in preparation for const value trees #77227

oli-obk · 2020-09-26T13:28:13Z

This PR changes the Scalar::Bits { data: u128, size: u8 } variant to Scalar::Bits(ScalarInt) where ScalarInt contains the same information, but is repr(packed). The reason for using a packed struct is to allow enum variant packing to keep the original size of Scalar instead of adding another word to its size due to padding.
Other than that the PR just gets rid of all the inspection of the internal fields of Scalar::Bits which were frankly scary. These fields have invariants that we need to uphold and we can't do that without making the fields private.

r? @ghost

oli-obk · 2020-09-26T13:28:26Z

@bors try @rust-timer queue

rust-timer · 2020-09-26T13:28:27Z

Awaiting bors try build completion

bors · 2020-09-26T13:28:39Z

⌛ Trying commit 89f2ad1a114cc01b7a4c62d6d0ebf6f77d21622b with merge 134bd8a017e8ebd9440a86f3e0e8e17c74265fac...

RalfJung · 2020-09-26T13:36:15Z

Other than that the PR just gets rid of all the inspection of the internal fields of Scalar::Bits which were frankly scary. These fields have invariants that we need to uphold and we can't do that without making the fields private.

I'm a big fan just for this alone. :) I had started proper encapsulation a year ago or so but gave up when I realized how many things I'd have to change/duplicate. Thanks for pushing it through!

rust-log-analyzer · 2020-09-26T13:51:06Z

The job dist-x86_64-linux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

   Compiling rand v0.7.3
   Compiling rustc-rayon v0.3.0
   Compiling tempfile v3.1.0
   Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
error[E0026]: variant `rustc_mir::interpret::Scalar::Raw` does not have a field named `data`
   --> src/librustdoc/clean/utils.rs:501:64
    |
501 |         (ty::ConstKind::Value(ConstValue::Scalar(Scalar::Raw { data, .. })), ty::Uint(ui)) => {
    |                                                                ^^^^ variant `rustc_mir::interpret::Scalar::Raw` does not have this field

error[E0026]: variant `rustc_mir::interpret::Scalar::Raw` does not have a field named `data`
   --> src/librustdoc/clean/utils.rs:504:64
    |
504 |         (ty::ConstKind::Value(ConstValue::Scalar(Scalar::Raw { data, .. })), ty::Int(i)) => {
    |                                                                ^^^^ variant `rustc_mir::interpret::Scalar::Raw` does not have this field
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0026`.
error: could not compile `rustdoc`.
---
== clock drift check ==
  local time: Sat Sep 26 13:50:56 UTC 2020
  network time: Sat, 26 Sep 2020 13:50:57 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (3931) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

bors · 2020-09-26T13:51:16Z

💔 Test failed - checks-actions

oli-obk · 2020-09-26T14:38:09Z

@bors try @rust-timer queue

rust-timer · 2020-09-26T14:38:10Z

Awaiting bors try build completion

bors · 2020-09-26T14:38:27Z

⌛ Trying commit 80ba12b12c3223608dd35bf0f6ab637f4107c397 with merge 29ff7ae431118bb8c870e65f059956edd80d72bd...

rust-log-analyzer · 2020-09-26T15:01:06Z

The job dist-x86_64-linux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

Documenting stage2 std (x86_64-unknown-linux-gnu)
Uplifting stage1 std (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
Copying stage2 std from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
 Documenting core v0.0.0 (/checkout/library/core)
thread 'rustc' panicked at 'called `Result::unwrap()` on an `Err` value: InterpErrorInfo { kind: scalar size mismatch: expected 4 bytes but got 8 bytes instead, backtrace: None }', compiler/rustc_middle/src/ty/print/pretty.rs:1019:57

error: internal compiler error: unexpected panic


error: Unrecognized option: 'markdown-css'

error: Could not document `core`.
Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name core library/core/src/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-linux-gnu/doc --error-format=json --json=diagnostic-rendered-ansi --markdown-css rust.css --markdown-no-toc -Z unstable-options --resource-suffix 1.48.0 --index-page /checkout/src/doc/index.md -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps -Dwarnings -Winvalid_codeblock_attributes --crate-version '1.48.0-nightly
  (29ff7ae43
  2020-09-26)'` (exit code: 1)


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "rustdoc" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "core" "--" "--markdown-css" "rust.css" "--markdown-no-toc" "-Z" "unstable-options" "--resource-suffix" "1.48.0" "--index-page" "/checkout/src/doc/index.md"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
Build completed unsuccessfully in 0:19:38
Build completed unsuccessfully in 0:19:38
== clock drift check ==
  local time: Sat Sep 26 15:00:57 UTC 2020
  network time: Sat, 26 Sep 2020 15:00:57 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (4977) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

bors · 2020-09-26T15:01:14Z

💔 Test failed - checks-actions

oli-obk · 2020-09-26T16:32:34Z

@bors try @rust-timer queue

rust-timer · 2020-09-26T16:32:35Z

Awaiting bors try build completion

bors · 2020-09-26T16:32:46Z

⌛ Trying commit 4a76f0c2e42d903fa47034b0e38409189c4aab56 with merge 048704194617fee95a0d314d059abe90713b565a...

bors · 2020-09-26T17:20:26Z

☀️ Try build successful - checks-actions, checks-azure
Build commit: 048704194617fee95a0d314d059abe90713b565a (048704194617fee95a0d314d059abe90713b565a)

rust-timer · 2020-09-26T17:20:28Z

Queued 048704194617fee95a0d314d059abe90713b565a with parent 6f9a8a7, future comparison URL.

rust-timer · 2020-09-26T18:40:14Z

Finished benchmarking try commit (048704194617fee95a0d314d059abe90713b565a): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

oli-obk · 2020-09-27T08:50:10Z

I think there's two regressions, one for serializing data, one for check_match, so I'm testing just the first part in #77261

…r, r=matthewjasper Deduplicate and generalize some (de/)serializer impls I noticed this while implementing rust-lang#77227 and getting a "not implemented for [T; 16]" error. There's likely more things we can deduplicate in this file, but I didn't need any additional changes.

compiler/rustc_middle/src/ty/consts/int.rs

RalfJung · 2020-11-04T11:17:14Z

after the last nits are fixed, r=me for the Miri and CTFE changes. @bjorn3 can you check the cranelift changes?

compiler/rustc_codegen_cranelift/src/value_and_place.rs

…hus we use `to_bits` with the correct size

oli-obk · 2020-11-04T14:00:43Z

@bors r=RalfJung

bors · 2020-11-04T14:00:44Z

📌 Commit 6e6c8a8 has been approved by RalfJung

compiler/rustc_target/src/abi/mod.rs

Co-authored-by: Ralf Jung <post@ralfj.de>

oli-obk · 2020-11-04T14:13:19Z

@bors r=RalfJung

bors · 2020-11-04T14:13:20Z

📌 Commit 332750f has been approved by RalfJung

bors · 2020-11-04T14:26:09Z

⌛ Testing commit 332750f with merge 75f1db1...

bors · 2020-11-04T16:41:14Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 75f1db1 to master...

rust-highfive · 2020-11-04T16:42:35Z

📣 Toolstate changed by #77227!

Tested on commit 75f1db1.
Direct link to PR: #77227

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@75f1db1. Direct link to PR: <rust-lang/rust#77227> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

cc rust-lang/rust#77227

rust-highfive assigned petrochenkov Sep 26, 2020

This comment has been minimized.

Sign in to view

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 26, 2020

oli-obk unassigned petrochenkov Sep 26, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2020

oli-obk force-pushed the const_val_ branch from 89f2ad1 to 80ba12b Compare September 26, 2020 14:37

oli-obk mentioned this pull request Sep 28, 2020

Deduplicate and generalize some (de/)serializer impls #77261

Merged

RalfJung reviewed Nov 4, 2020

View reviewed changes

compiler/rustc_middle/src/ty/consts/int.rs Outdated Show resolved Hide resolved

RalfJung reviewed Nov 4, 2020

View reviewed changes

compiler/rustc_middle/src/ty/consts/int.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Nov 4, 2020

View reviewed changes

compiler/rustc_codegen_cranelift/src/value_and_place.rs Show resolved Hide resolved

oli-obk added 4 commits November 4, 2020 13:41

u128 truncation and sign extension are not just interpreter related

abacaf2

Document an unwrap

2e53625

Make ScalarInt entirely independent of MIR interpretation

97bfff1

u64::try_from will now fail if ScalarInt isn't exactly 64 bits, t…

6e6c8a8

…hus we use `to_bits` with the correct size

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 Nov 4, 2020

RalfJung reviewed Nov 4, 2020

View reviewed changes

compiler/rustc_target/src/abi/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed Nov 4, 2020

View reviewed changes

compiler/rustc_target/src/abi/mod.rs Outdated Show resolved Hide resolved

oli-obk and others added 2 commits November 4, 2020 15:12

Update compiler/rustc_target/src/abi/mod.rs

5f087f0

Co-authored-by: Ralf Jung <post@ralfj.de>

Update compiler/rustc_target/src/abi/mod.rs

332750f

Co-authored-by: Ralf Jung <post@ralfj.de>

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2020

rust-highfive mentioned this pull request Nov 4, 2020

miri no longer builds after rust-lang/rust#77227 #78741

Closed

bors merged commit 75f1db1 into rust-lang:master Nov 4, 2020

rustbot added this to the 1.49.0 milestone Nov 4, 2020

camsteffen added a commit to camsteffen/rust-clippy that referenced this pull request Nov 4, 2020

Rustc changes

b481a52

cc rust-lang/rust#77227

camsteffen added a commit to camsteffen/rust-clippy that referenced this pull request Nov 4, 2020

Rustc changes

51b0d4a

cc rust-lang/rust#77227

oli-obk deleted the const_val_🌳_prelude branch March 16, 2021 12:14

lcnr added the A-const-generics Area: const generics (parameters and arguments) label Dec 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactorings in preparation for const value trees #77227

Refactorings in preparation for const value trees #77227

oli-obk commented Sep 26, 2020 •

edited

Loading

This comment has been minimized.

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

RalfJung commented Sep 26, 2020

rust-log-analyzer commented Sep 26, 2020

bors commented Sep 26, 2020

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

rust-log-analyzer commented Sep 26, 2020

bors commented Sep 26, 2020

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

bors commented Sep 26, 2020

rust-timer commented Sep 26, 2020

rust-timer commented Sep 26, 2020

oli-obk commented Sep 27, 2020

RalfJung commented Nov 4, 2020

oli-obk commented Nov 4, 2020

bors commented Nov 4, 2020

oli-obk commented Nov 4, 2020

bors commented Nov 4, 2020

bors commented Nov 4, 2020

bors commented Nov 4, 2020

rust-highfive commented Nov 4, 2020

Refactorings in preparation for const value trees #77227

Refactorings in preparation for const value trees #77227

Conversation

oli-obk commented Sep 26, 2020 • edited Loading

This comment has been minimized.

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

RalfJung commented Sep 26, 2020

rust-log-analyzer commented Sep 26, 2020

bors commented Sep 26, 2020

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

rust-log-analyzer commented Sep 26, 2020

bors commented Sep 26, 2020

oli-obk commented Sep 26, 2020

rust-timer commented Sep 26, 2020

bors commented Sep 26, 2020

bors commented Sep 26, 2020

rust-timer commented Sep 26, 2020

rust-timer commented Sep 26, 2020

oli-obk commented Sep 27, 2020

RalfJung commented Nov 4, 2020

oli-obk commented Nov 4, 2020

bors commented Nov 4, 2020

oli-obk commented Nov 4, 2020

bors commented Nov 4, 2020

bors commented Nov 4, 2020

bors commented Nov 4, 2020

rust-highfive commented Nov 4, 2020

oli-obk commented Sep 26, 2020 •

edited

Loading