Skip to content

Fix handling of control flow instructions in convert_to_target() (backport #11877)#11884

Merged
jakelishman merged 1 commit into
stable/1.0from
mergify/bp/stable/1.0/pr-11877
Feb 29, 2024
Merged

Fix handling of control flow instructions in convert_to_target() (backport #11877)#11884
jakelishman merged 1 commit into
stable/1.0from
mergify/bp/stable/1.0/pr-11877

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 26, 2024

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


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

)

This commit fixes an issue in the convert_to_target() function where it
wasn't looking for control flow instructions in the proper location.
Typically the control flow instructions are put in the
supported_instructions field of the BackendConfiguration, but the
convert_to_target() function was ignoring this field. This commit
updates the function to check supported_instructions for the control
flow instructions. It doesn't more broadly look at
the supported_instructions field, because on other backends this field
is used to list the supported pulse instructions which might have name
conflicts with other instructions and cause issues building a target.

Fixes #11872

(cherry picked from commit 65ab965)
@mergify mergify Bot requested review from a team and jyu00 as code owners February 26, 2024 10:29
@qiskit-bot
Copy link
Copy Markdown
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

  • @Qiskit/terra-core

@github-actions github-actions Bot added the Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog. label Feb 26, 2024
@github-actions github-actions Bot added this to the 1.0.2 milestone Feb 26, 2024
@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 8047382833

Details

  • 0 of 3 (100.0%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.02%) to 89.285%

Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/lex.rs 1 92.44%
Totals Coverage Status
Change from base Build 8046413879: 0.02%
Covered Lines: 58902
Relevant Lines: 65971

💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Feb 29, 2024
Merged via the queue into stable/1.0 with commit 2463f16 Feb 29, 2024
@mergify mergify Bot deleted the mergify/bp/stable/1.0/pr-11877 branch February 29, 2024 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants