chore: remove dependency on generational-arena by michaeljklein · Pull Request #4207 · noir-lang/noir

michaeljklein · 2024-01-30T16:08:42Z

Description

Problem*

Resolves #15 (comment)

Summary*

Replaces generational-arena's Arena class with a thin wrapper around Vec

Additional Context

The thin wrapper is helpful for:

insert returning the index
iter iterating over the (index, item) pairs

Documentation*

Check one:

No documentation needed.
Documentation included in this PR.
[Exceptional Case] Documentation to be submitted in a separate PR.

PR Checklist*

I have tested the changes locally.
I have formatted the changes with Prettier and/or cargo fmt on default settings.

…rena class

compiler/utils/arena/src/lib.rs

jfecher

LGTM. Unsure what the errors in the stdlib are coming from seeing as this PR doesn't actually change any of the method interface.

In particular std::wrapping_add seems to have somehow been given the type [Field; 16]... odd

compiler/utils/arena/src/lib.rs

kevaundray · 2024-02-01T12:27:25Z

Removed wip from pr scope and put PR as a draft

compiler/noirc_frontend/src/hir/type_check/mod.rs

…na, Index} to {Arena, Index}, added tests for parity between arenas to class, added missing instances, found inconsistency, wip debugging

…rena

compiler/noirc_frontend/src/hir_def/stmt.rs

jfecher · 2024-02-12T19:52:16Z

This PR is working locally now for me

jfecher · 2024-02-13T17:27:45Z

@michaeljklein is this ready for review now? Or are we waiting until the generational index is removed from Index?

michaeljklein · 2024-02-13T22:46:51Z

@jfecher it's ready for review

jfecher

A few comments. - There is also the PartialEq comment from above

compiler/noirc_frontend/src/hir/def_map/item_scope.rs

compiler/noirc_frontend/src/hir/def_map/module_data.rs

compiler/noirc_frontend/src/hir/type_check/mod.rs

jfecher · 2024-02-15T20:32:01Z

I've found the origin of the errors in this PR. In id_to_type we're overwriting ExprId's types with DefinitionId's types and vice-versa because of the impl From<DefinitionId> for Index. In converting a definitionId to an index, the indices used may overlap since they originate from different maps. So when inserting them both into id_to_type we overwrite types and everything breaks.

compiler/noirc_frontend/src/node_interner.rs

# Description ## Problem\* Resolves the underlying issue with #4207 where definition/expr types are being overwritten by other exprs/definitions because DefinitionIds are converted into Indexes which may clash with those from expressions. ## Summary\* Separates out `id_to_type` into another map for only definitions: `definition_to_type` to resolve the clash. I've also removed the `impl From<DefinitionId> for Index` to prevent this issue in the future. ## Additional Context ## Documentation\* Check one: - [x] No documentation needed. - [ ] Documentation included in this PR. - [ ] **[Exceptional Case]** Documentation to be submitted in a separate PR. # PR Checklist\* - [x] I have tested the changes locally. - [x] I have formatted the changes with [Prettier](https://prettier.io/) and/or `cargo fmt` on default settings.

jfecher

Thanks!

* master: (39 commits) chore: remove unwanted prints (#4419) fix: remove print from monomorphization pass (#4417) chore(ssa): Remove mem2reg run before flattening (#4415) feat: Add HashMap to the stdlib (#4242) fix!: Ban Fields in for loop indices and bitwise ops (#4376) chore: Add #[recursive] Explainer to Documentation (#4399) feat(ci): Use wasm-opt when compiling wasm packages (#4334) fix: add handling to `noir_wasm` for projects without dependencies (#4344) chore: rename parameter 'filter' to 'level' in 'init_log_level' (#4403) chore!: bump msrv to 1.73.0 (#4406) chore: fix docker test workflows (#4308) chore: Update Vec docs (#4400) feat: update error message when trying to load workspace as dependency (#4393) chore: bump webpack dependencies (#4346) fix: correct invalid brillig codegen for `EmbeddedCurvePoint.add` (#4382) chore: remove dependency on generational-arena (#4207) fix(docs): update install versions (#4396) fix: Enforce matching types of binary ops in SSA (#4391) fix(docs): Update noirjs_app for 0.23 (#4378) chore(ci): add alerts for failed publishes (#4388) ...

* master: (440 commits) chore: remove duplicate `parse_all` function in wasm compiler (#4411) chore(ci): prevent msrv checks from blocking PRs (#4414) feat: expose separate functions to compile programs vs contracts in `noir_wasm` (#4413) chore: do not panic when dividing by zero (#4424) chore: remove unwanted prints (#4419) fix: remove print from monomorphization pass (#4417) chore(ssa): Remove mem2reg run before flattening (#4415) feat: Add HashMap to the stdlib (#4242) fix!: Ban Fields in for loop indices and bitwise ops (#4376) chore: Add #[recursive] Explainer to Documentation (#4399) feat(ci): Use wasm-opt when compiling wasm packages (#4334) fix: add handling to `noir_wasm` for projects without dependencies (#4344) chore: rename parameter 'filter' to 'level' in 'init_log_level' (#4403) chore!: bump msrv to 1.73.0 (#4406) chore: fix docker test workflows (#4308) chore: Update Vec docs (#4400) feat: update error message when trying to load workspace as dependency (#4393) chore: bump webpack dependencies (#4346) fix: correct invalid brillig codegen for `EmbeddedCurvePoint.add` (#4382) chore: remove dependency on generational-arena (#4207) ...

michaeljklein and others added 5 commits January 30, 2024 11:04

wip: remove dependency on generational-arena, add minimal vec-based a…

f27b439

…rena class

cargo fmt

7f95c26

Merge branch 'master' into michaeljklein/vec-arena

648c00c

Merge branch 'master' into michaeljklein/vec-arena

f761a97

cargo clippy

da7e219

TomAFrench reviewed Jan 30, 2024

View reviewed changes

compiler/utils/arena/src/lib.rs Show resolved Hide resolved

michaeljklein and others added 2 commits January 30, 2024 12:54

revert warnings for unused crates

f836981

Merge branch 'master' into michaeljklein/vec-arena

257ca9d

jfecher reviewed Jan 30, 2024

View reviewed changes

compiler/utils/arena/src/lib.rs Outdated Show resolved Hide resolved

michaeljklein and others added 4 commits January 30, 2024 16:21

Merge branch 'master' into michaeljklein/vec-arena

10f161a

rename ix -> index

9203fe5

Merge branch 'master' into michaeljklein/vec-arena

ad7958e

make Index a tuple struct

00531d2

kevaundray changed the title ~~wip: remove dependency on generational-arena~~ chore: remove dependency on generational-arena Feb 1, 2024

kevaundray marked this pull request as draft February 1, 2024 12:26

kevaundray reviewed Feb 1, 2024

View reviewed changes

compiler/noirc_frontend/src/hir/type_check/mod.rs Outdated Show resolved Hide resolved

kevaundray and others added 5 commits February 1, 2024 12:29

Update compiler/noirc_frontend/src/hir/type_check/mod.rs

b8098c8

Merge branch 'master' into michaeljklein/vec-arena

d8581f4

added back generational_arena, added copy of generational_arena::{Are…

151a23c

…na, Index} to {Arena, Index}, added tests for parity between arenas to class, added missing instances, found inconsistency, wip debugging

wip debugging failing test

86d120e

Merge remote-tracking branch 'origin/master' into michaeljklein/vec-a…

5d0a77b

…rena

jfecher reviewed Feb 12, 2024

View reviewed changes

compiler/noirc_frontend/src/hir_def/stmt.rs Outdated Show resolved Hide resolved

Fix compile errors from aztec_macros

cd279cd

jfecher and others added 4 commits February 12, 2024 13:53

Fmt

ed62fd7

Merge branch 'master' into michaeljklein/vec-arena

e1aa513

Fix frontend test

0f4f32d

Merge branch 'master' into michaeljklein/vec-arena

ec1c5c4

michaeljklein and others added 3 commits February 13, 2024 14:34

Merge branch 'master' into michaeljklein/vec-arena

948447c

remove generational arena test stubs, indices, etc

aa35b34

Merge branch 'master' into michaeljklein/vec-arena

9dbb84c

michaeljklein marked this pull request as ready for review February 13, 2024 22:46

cargo fmt

68d7cb6

jfecher reviewed Feb 14, 2024

View reviewed changes

compiler/noirc_frontend/src/hir/def_map/item_scope.rs Outdated Show resolved Hide resolved

compiler/noirc_frontend/src/hir/def_map/module_data.rs Outdated Show resolved Hide resolved

compiler/noirc_frontend/src/hir/type_check/mod.rs Outdated Show resolved Hide resolved

Merge branch 'master' into michaeljklein/vec-arena

b8d5b2e

jfecher added a commit that referenced this pull request Feb 15, 2024

Initial work on fixing #4207

63f627b

jfecher mentioned this pull request Feb 16, 2024

fix: DefinitionIds should not be stored in id_to_type #4397

Merged

5 tasks

jfecher reviewed Feb 16, 2024

View reviewed changes

compiler/noirc_frontend/src/node_interner.rs Show resolved Hide resolved

jfecher and others added 3 commits February 16, 2024 13:06

cleanup debugging, remove generational arena note from deny.toml

7885574

Merge branch 'master' into michaeljklein/vec-arena

881373d

jfecher approved these changes Feb 16, 2024

View reviewed changes

jfecher enabled auto-merge February 16, 2024 19:33

jfecher added this pull request to the merge queue Feb 16, 2024

Merged via the queue into master with commit 46f2204 Feb 16, 2024

jfecher deleted the michaeljklein/vec-arena branch February 16, 2024 19:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: remove dependency on generational-arena#4207

chore: remove dependency on generational-arena#4207
jfecher merged 29 commits intomasterfrom
michaeljklein/vec-arena

michaeljklein commented Jan 30, 2024

Uh oh!

Uh oh!

jfecher left a comment

Uh oh!

Uh oh!

kevaundray commented Feb 1, 2024

Uh oh!

Uh oh!

Uh oh!

jfecher commented Feb 12, 2024

Uh oh!

jfecher commented Feb 13, 2024

Uh oh!

michaeljklein commented Feb 13, 2024

Uh oh!

jfecher left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jfecher commented Feb 15, 2024

Uh oh!

Uh oh!

jfecher left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

michaeljklein commented Jan 30, 2024

Description

Problem*

Summary*

Additional Context

Documentation*

PR Checklist*

Uh oh!

Uh oh!

jfecher left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kevaundray commented Feb 1, 2024

Uh oh!

Uh oh!

Uh oh!

jfecher commented Feb 12, 2024

Uh oh!

jfecher commented Feb 13, 2024

Uh oh!

michaeljklein commented Feb 13, 2024

Uh oh!

jfecher left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jfecher commented Feb 15, 2024

Uh oh!

Uh oh!

jfecher left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants