Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement (but don't use) valtree and refactor in preparation of use #82936

Merged
merged 27 commits into from
Mar 17, 2021
Merged

Implement (but don't use) valtree and refactor in preparation of use #82936

merged 27 commits into from
Mar 17, 2021

Commits on Mar 12, 2021

  1. Implement valtree 

    valtree is a version of constants that is inherently safe to be used within types.
This is in contrast to ty::Const which can have different representations of the same value. These representation differences can show up in hashing or equality comparisons, breaking type equality of otherwise equal types.
valtrees do not have this problem.
    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    a4fbac1 View commit details
    Browse the repository at this point in the history

  2. Intern valtree field vector

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    0fe4f38 View commit details
    Browse the repository at this point in the history

  3. Add fallible Scalar to ScalarInt conversion method

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    858216c View commit details
    Browse the repository at this point in the history

  4. Add convenience conversion methods for ScalarInt

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    09f7f91 View commit details
    Browse the repository at this point in the history

  5. Resolve a FIXME around type equality checks in Relate for constants

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    019dba0 View commit details
    Browse the repository at this point in the history

  6. Reduce destructuring and re-interning where possible

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    4d917fa View commit details
    Browse the repository at this point in the history

  7. Reduce the duplication in the relation logic for constants

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    5e8a89b View commit details
    Browse the repository at this point in the history

  8. Pull out ConstValue relating into its own function

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    b729cc9 View commit details
    Browse the repository at this point in the history

  9. Split pretty printer logic for scalar int and scalar ptr 

    Value trees won't have scalar ptr at all, so we need a scalar int printing method anyway. This way we'll be able to share that method between all const representations.
    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    0bb367e View commit details
    Browse the repository at this point in the history

  10. Use the explicit error constant instead of fake dummies

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    d5eec65 View commit details
    Browse the repository at this point in the history

  11. Add ty helper function for mir constants 

    This is in preparation of the `literal` field becoming an enum that distinguishes between type level constants and runtime constants
    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    914df2a View commit details
    Browse the repository at this point in the history

  12. Directly intern allocations so that we can write a Lift impl for them

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    3ecde6f View commit details
    Browse the repository at this point in the history

  13. Prepare mir::Constant for ty::Const only supporting valtrees

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    3127a9c View commit details
    Browse the repository at this point in the history

  14. Replace a custom lift method with a Lift impl

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    20f7379 View commit details
    Browse the repository at this point in the history

  15. Visit mir::Constant::user_ty for completeness. 

    It's not necessary yet, but it may become necessary with things like lazy normalization.
    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    6ca1d87 View commit details
    Browse the repository at this point in the history

  16. We won't support trait object constants in type level constants for t… 

    …he forseeable future
    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    c51749a View commit details
    Browse the repository at this point in the history

  17. Run rustfmt

    @oli-obk
    oli-obk committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    11ddd22 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. s/ConstantSource/ConstantKind/

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    c30c1be View commit details
    Browse the repository at this point in the history

  2. Document valtree

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    bc8641a View commit details
    Browse the repository at this point in the history

  3. Explain why we do not allow const_to_valtree to read from statics

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    f646c1e View commit details
    Browse the repository at this point in the history

  4. Explain how we encode enums at the encoding site

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    c01c494 View commit details
    Browse the repository at this point in the history

  5. Explain pointer and dyn Trait handling in const_to_valtree

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    0dd5a1b View commit details
    Browse the repository at this point in the history

  6. Do not expose fallible to_int operation on Scalar. 

    Any use of it has been shown to be a bug in the past.
    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    9f407ae View commit details
    Browse the repository at this point in the history

  7. Pacify tidy

    @oli-obk
    oli-obk committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    1ffd21a View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Update compiler/rustc_mir/src/const_eval/mod.rs 

    Co-authored-by: Ralf Jung <post@ralfj.de>
    @oli-obk @RalfJung
    oli-obk and RalfJung committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    f0997fa View commit details
    Browse the repository at this point in the history

  2. Update compiler/rustc_middle/src/ty/consts/valtree.rs 

    Co-authored-by: Ralf Jung <post@ralfj.de>
    @oli-obk @RalfJung
    oli-obk and RalfJung committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    5b9bd90 View commit details
    Browse the repository at this point in the history

  3. Update compiler/rustc_middle/src/ty/consts/valtree.rs 

    Co-authored-by: Ralf Jung <post@ralfj.de>
    @oli-obk @RalfJung
    oli-obk and RalfJung committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    c4d564c View commit details
    Browse the repository at this point in the history