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

Don't Dedup modules if it would change semantics (bp #1713) #1715

Merged
merged 3 commits into from
Jun 24, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 24, 2020

This is an automated backport of pull request #1713 done by Mergify

Cherry-pick of e0e6856 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   src/main/scala/firrtl/transforms/Dedup.scala
	both modified:   src/test/scala/firrtlTests/transforms/DedupTests.scala

no changes added to commit (use "git add" and/or "git commit -a")

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 simulator.

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

If a module has ports of type Bundle that are used in aggregate
connections in parent modules, Dedup cannot change the names of the
fields of the Bundle or it would change the semantics of the connection.
Dedup now detects this case and refrains from agnostifying the ports of
such modules to prevent this issue.

(cherry picked from commit e0e6856)

# Conflicts:
#	src/main/scala/firrtl/transforms/Dedup.scala
#	src/test/scala/firrtlTests/transforms/DedupTests.scala
@mergify mergify bot requested a review from a team as a code owner June 24, 2020 03:21
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Jun 24, 2020
@jackkoenig jackkoenig merged commit f823c2d into 1.3.x Jun 24, 2020
@mergify mergify bot deleted the mergify/bp/1.3.x/pr-1713 branch June 24, 2020 05:13
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