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

Dont wrap elaboration annotations (bp #1374) #1378

Merged
merged 6 commits into from
Mar 19, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2020

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

Cherry-pick of 18520bf has failed:

On branch mergify/bp/3.2.x/pr-1374
Your branch is ahead of 'origin/3.2.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 18520bf1.
  (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/test/scala/chiselTests/stage/ChiselMainSpec.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
  • @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/

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

squash! Wrap elaboration in ChiselException

(cherry picked from commit d67c410)
Changes the behavior of ChiselException stack trace trimming to use
either the first exception that includes a method from the Builder or
the outer exception.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 7397472)
@mergify mergify bot requested a review from a team as a code owner March 19, 2020 18:36
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Mar 19, 2020
Adds two tests:

  1. Test that an internal requirement failure (a bare exception) inside
     a Builder is properly reported/trimmed by ChsielStage/ChiselMain
  2. Test that the full stack trace includes the ChiselException

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 18520bf)
Co-authored-by: Jack Koenig <koenig@sifive.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 30a0a5f)
Change ChiselException.builderName to compute the name of Chisel's
internal Builder as opposed to hard-coding this with a string.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 969a56d)
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
(cherry picked from commit 3171cdf)
@mergify mergify bot merged commit e14dc6d into 3.2.x Mar 19, 2020
@mergify mergify bot deleted the mergify/bp/3.2.x/pr-1374 branch March 19, 2020 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants