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

Ensure InlineCasts does not inline complex Expressions (bp #2130) #2142

Open
wants to merge 1 commit into
base: 1.2.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2021

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

Cherry-pick of b274b31 has failed:

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

You are currently cherry-picking commit b274b319.
  (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/FirrtlSpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/firrtl/transforms/InlineCasts.scala
	both modified:   src/test/scala/firrtlTests/InlineCastsSpec.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, InlineCasts could inline complex (ie. non-cast) Expressions
into other complex Expressions. Now it will only inline so long as there
no more than 1 complex Expression in the current nested Expression.

Co-authored-by: Albert Magyar <[email protected]>
(cherry picked from commit b274b31)

# Conflicts:
#	src/main/scala/firrtl/transforms/InlineCasts.scala
#	src/test/scala/firrtlTests/InlineCastsSpec.scala
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Mar 19, 2021
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 bp-conflict
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant