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

Error when calling define targeting a child of a probe (backport #4175) #4176

Merged
merged 2 commits into from
Jun 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2024

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • Bugfix

Desired Merge Strategy

  • Squash

Release Notes

This is already an error caught in firtool, now Chisel will error earlier.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

This is an automatic backport of pull request #4175 done by [Mergify](https://mergify.com).

(cherry picked from commit 4de3581)

# Conflicts:
#	core/src/main/scala/chisel3/internal/package.scala
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Jun 14, 2024
Copy link
Contributor Author

mergify bot commented Jun 14, 2024

Cherry-pick of 4de3581 has failed:

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

You are currently cherry-picking commit 4de35818c.
  (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:   core/src/main/scala/chisel3/probe/package.scala
	modified:   src/test/scala/chiselTests/ProbeSpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/main/scala/chisel3/internal/package.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the bp-conflict label Jun 14, 2024
@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Jun 14, 2024
@chiselbot chiselbot merged commit 98cc79f into 6.x Jun 14, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-4175 branch June 14, 2024 19:45
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 Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants