Skip to content

Conform with recent rustc changes (caller_location intrinsic) - #376

Merged
adpaco merged 2 commits into
model-checking:main-154-2021-08-02from
adpaco:fix-main-154-2021-08-02
Aug 2, 2021
Merged

Conform with recent rustc changes (caller_location intrinsic)#376
adpaco merged 2 commits into
model-checking:main-154-2021-08-02from
adpaco:fix-main-154-2021-08-02

Conversation

@adpaco

@adpaco adpaco commented Aug 2, 2021

Copy link
Copy Markdown
Contributor

Description of changes:

This is PR handles the new caller_location intrinsic for #346 to be completed. Surprisingly, the regression has not failed in CI, but it is doing so locally. This has caused two new issues to be opened, #374 (extend intrinsic) and #375 (verify CI).

Testing:

  • How is this change tested? Existing regression.

  • Is this a refactor change? No.

Checklist

  • Each commit message has a non-empty body, explaining why the change was made
  • Methods or procedures are documented
  • Regression or unit tests are included, or existing tests cover the modified code
  • My PR is restricted to a single feature or bugfix

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

"bswap" => self.codegen_expr_to_place(p, fargs.remove(0).bswap()),
// TODO: Handle new `caller_location` intrinsic
// https://github.com/model-checking/rmc/issues/374
"caller_location" => Stmt::skip(loc),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: should this be codegen_unimplemented_intrinsic since it isn't used in any tests?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, thanks! Updated both the code and #375.

@adpaco
adpaco merged commit bb7fac1 into model-checking:main-154-2021-08-02 Aug 2, 2021
adpaco added a commit that referenced this pull request Aug 6, 2021
* Handle `caller_location` intrinsic with skip statement

* Use `codegen_unimplemented_instrinsic` instead
adpaco added a commit that referenced this pull request Aug 17, 2021
* Handle `caller_location` intrinsic with skip statement

* Use `codegen_unimplemented_instrinsic` instead
adpaco added a commit that referenced this pull request Aug 24, 2021
* Handle `caller_location` intrinsic with skip statement

* Use `codegen_unimplemented_instrinsic` instead
tedinski pushed a commit to tedinski/rmc that referenced this pull request Apr 26, 2022
…checking#376)

* Handle `caller_location` intrinsic with skip statement

* Use `codegen_unimplemented_instrinsic` instead
tedinski pushed a commit that referenced this pull request Apr 27, 2022
* Handle `caller_location` intrinsic with skip statement

* Use `codegen_unimplemented_instrinsic` instead
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants