Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Fix cat of zero-width SInt (bp #2116) #2118

Merged
merged 2 commits into from
Mar 14, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2021

This is an automatic backport of pull request #2116 done by Mergify.

Cherry-pick of fd55c51 has failed:

On branch mergify/bp/1.3.x/pr-2116
Your branch is up to date with 'origin/1.3.x'.

You are currently cherry-picking commit fd55c51b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/test/scala/firrtlTests/ZeroWidthTests.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/firrtl/passes/ZeroWidth.scala

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Previously, concatenating two SInts where one is of zero-width would
return the non-zero-width SInt. This is incorrect because the output of
Cat should be of type UInt. Now the ZeroWidth transform will introduce a
cast when removing a Cat when the argument type is non-UInt.

(cherry picked from commit fd55c51)

# Conflicts:
#	src/main/scala/firrtl/passes/ZeroWidth.scala
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Mar 14, 2021
@mergify mergify bot merged commit b34fffd into 1.3.x Mar 14, 2021
@mergify mergify bot deleted the mergify/bp/1.3.x/pr-2116 branch March 14, 2021 06:51
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant