Skip to content

Revert "Cranelift: Rewrite or(and(x, y), not(y)) => or(x, not(y))"#5682

Merged
elliottt merged 1 commit into
mainfrom
revert-5676-or-and-y-with-not-y
Feb 1, 2023
Merged

Revert "Cranelift: Rewrite or(and(x, y), not(y)) => or(x, not(y))"#5682
elliottt merged 1 commit into
mainfrom
revert-5676-or-and-y-with-not-y

Conversation

@elliottt
Copy link
Copy Markdown
Member

@elliottt elliottt commented Feb 1, 2023

Reverts #5676

Fixes #5680.

Copy link
Copy Markdown
Member

@cfallin cfallin left a comment

Choose a reason for hiding this comment

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

LGTM in case this turns green and is the fix.

@github-actions github-actions Bot added the cranelift Issues related to the Cranelift code generator label Feb 1, 2023
@elliottt elliottt enabled auto-merge (squash) February 1, 2023 02:09
@elliottt elliottt merged commit 268f6bf into main Feb 1, 2023
@elliottt elliottt deleted the revert-5676-or-and-y-with-not-y branch February 1, 2023 02:53
fitzgen added a commit to fitzgen/wasmtime that referenced this pull request Feb 1, 2023
This rewrite was introduced in bytecodealliance#5676 and then reverted in bytecodealliance#5682 due to a footgun
where we accidentally weren't actually checking the `y == !z` precondition. This
commit fixes the precondition check.

This reverts commit 268f6bf.
fitzgen added a commit to fitzgen/wasmtime that referenced this pull request Feb 1, 2023
This rewrite was introduced in bytecodealliance#5676 and then reverted in bytecodealliance#5682 due to a footgun
where we accidentally weren't actually checking the `y == !z` precondition. This
commit fixes the precondition check.

This reverts commit 268f6bf.
fitzgen added a commit to fitzgen/wasmtime that referenced this pull request Feb 1, 2023
This rewrite was introduced in bytecodealliance#5676 and then reverted in bytecodealliance#5682 due to a footgun
where we accidentally weren't actually checking the `y == !z` precondition. This
commit fixes the precondition check. It also fixes the arithmetic to be
correctly masked to the value type's width.

This reverts commit 268f6bf.
fitzgen added a commit that referenced this pull request Feb 1, 2023
)

This rewrite was introduced in #5676 and then reverted in #5682 due to a footgun
where we accidentally weren't actually checking the `y == !z` precondition. This
commit fixes the precondition check. It also fixes the arithmetic to be
correctly masked to the value type's width.

This reverts commit 268f6bf.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cranelift Issues related to the Cranelift code generator

Projects

None yet

Development

Successfully merging this pull request may close these issues.

wasi-nn test broken on main

2 participants