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.

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

Merge reference types repo #120

Merged
merged 694 commits into from
Jun 16, 2020
Merged

Merge reference types repo #120

merged 694 commits into from
Jun 16, 2020

Conversation

aheejin
Copy link
Member

@aheejin aheejin commented Jun 15, 2020

This merges reference types repo. The only thing manually fixed was
resolving conflict in README.md.

cc @ioannad

Ms2ger and others added 30 commits March 15, 2019 18:11
The full error message generated by the interpreter is "unreachable executed", but all of the other tests check for just "unreachable".
* Add missing eq_ref
* Fix export index computation
* Remove bogus test
The start function is invoked after the store has been modified. So if a
start function traps, all data and element segments will have been
copied into the memory and table respectively. This means that functions
can be invoked on this instance, even though the instance is not
available to the embedder directly.
use `local.get` name instead of `get_local` which isn't used elsewhere.
…Assembly#75)

* Rename elem/data.drop
* Reorder bulk instructions
* Rename interpreter AST ref constructors to match reftype repo
* Update interpreter README
… op proposal (WebAssembly#35)

Adds table.size, table.grow, table.fill to overview, spec, interpreter, and tests, as decided at recent CG meeting. Also adds a few more tests for table.get and table.set.

Also, change interpreter's segment encoding to match bulk ops proposal, addressing WebAssembly#18. (Not updated in spec yet, since corresponding spec text is still missing from bulk ops proposal.)
The data count section has a count that must match the number of data segments. If the data count section isn't present, then `memory.init` and `data.drop` cannot be used.

Fixes issue WebAssembly#73.
* Add definition of free index sets
* Simplify datacount side condition
* Explain convention about multiple occurrences of meta variables
binji and others added 17 commits May 13, 2020 13:19
Issue WebAssembly/reference-types#69 requires
that `ref.null` instructions include a reference type immediate. This
concept isn't present in the bulk-memory proposal, but the encoding is
(in element segment expressions).

This change updates the binary and text format, but not the syntax. This
is OK for now, since the only reference type allowed here is `funcref`.
The original commit to add a bottom type removed this test as it
would now unexpectedly validate. Now that a bottom type is removed
it would be good to keep it.
In the generated test files the generic imports contained a function that does not exist anymore. This caused all tests to fail. This PR removes the function from the imports.
* [js-api] Link to the fork for the core specification.

* [js-api] More subtyping removal.

* [js-api] Fix bugs in Table constructor.

* Add an assertion to ToWebAssemblyValue.
@aheejin aheejin requested review from Ms2ger and rossberg June 15, 2020 19:53
@aheejin
Copy link
Member Author

aheejin commented Jun 15, 2020

When merging, which button should I use, between "Create a merge commit" and "Rebase and merge"? (Certainly not "Squash and merge" this time :) ) "Create a merge commit" is currently disabled for this repo, but I can enable it if necessary.

@binji
Copy link
Member

binji commented Jun 15, 2020

@aheejin You'll want "Create a merge commit". I typically merge manually from the command-line so I don't have to enable the option (since we normally don't want it).

@aheejin
Copy link
Member Author

aheejin commented Jun 15, 2020

@binji Thanks!

By the way, this proposal also depends on multi-value. How should I maintain the merges between the two upstream repos? Just do merges from both repos and resolve conflicts?

@ioannad
Copy link
Collaborator

ioannad commented Jun 15, 2020

@aheejin I think the multi-value proposal is now merged in the main spec, so only the reference types spec needs to be merged here. What was the problem with #112 ?

@aheejin
Copy link
Member Author

aheejin commented Jun 15, 2020

@ioannad I didn't mean there was a problem with #112, but you said there were lots of conflicts (because we didn't revert all squashed commits, I presume?), I thought it would be cleaner to revert all squashed commits (which I did in #115, #116, #117, and #119) and merge upstream from the fresh state.

@ioannad
Copy link
Collaborator

ioannad commented Jun 15, 2020

Oh I see, thank you for explaining! I had reverted #91 and #96 in #112 but I missed that #88 was also squashed. I'll remove #112 then, and I'll rebase my version of the current EH core spec, when this PR here is merged.

Copy link
Member

@rossberg rossberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rubberstamp

@Ms2ger Ms2ger merged commit fa7165b into WebAssembly:master Jun 16, 2020
@aheejin
Copy link
Member Author

aheejin commented Jun 16, 2020

@Ms2ger Uh, sorry, you merged this using the command line..? This repo does not enable that option (unless you do that using the command line), so I'm wondering....

@aheejin aheejin deleted the merge_reftypes branch June 16, 2020 09:22
@Ms2ger
Copy link
Contributor

Ms2ger commented Jun 16, 2020

Yeah, it would be a little silly to do all this work to create an actual merge commit and then squash it in the UI :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.