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

Update toolchain to 2022-07-05 #1340

Merged
merged 6 commits into from
Jul 6, 2022

Conversation

celinval
Copy link
Contributor

@celinval celinval commented Jul 6, 2022

Description of changes:

Update toolchain to 2022-07-05

The updates required were related to the following changes:

Resolved issues:

Resolves #1336

Call-outs:

Testing:

  • How is this change tested? Existing tests

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

The updates required were related to the following changes:
  - Simplify memory ordering intrinsics
    - rust-lang/rust#97423
  - once cell renamings
    - rust-lang/rust#98165
  - Rename the ConstS::val field as kind
    - rust-lang/rust#97935
  - Remove the source archive functionality of ArchiveWriter
    - rust-lang/rust#98098
  - Use valtrees as the type-system representation for constant values
    - rust-lang/rust#96591
@celinval celinval requested a review from a team as a code owner July 6, 2022 06:23
typ,
loc,
"https://github.com/model-checking/kani/issues/1339",
);
}
}
_ => {}
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this do?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe this is a no-op. In this case, the unimplemented!() macro will be invoked at the end.

@@ -123,12 +122,22 @@ impl<'tcx> GotocCtx<'tcx> {
len_expr,
&self.symbol_table,
);
} else {
// TODO: Handle cases with other types such as tuples and larger integers.
let loc = span.map_or(Location::none(), |s| self.codegen_span(s));
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there is a codegen_span_option function that does this.

// expected result.

#![feature(core_intrinsics)]
use std::intrinsics::{
atomic_min, atomic_min_acq, atomic_min_acqrel, atomic_min_rel, atomic_min_relaxed,
atomic_min_acqrel, atomic_min_acquire, atomic_min_relaxed, atomic_min_release,
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the new namespace may include more options for atomic intrinsics: something for @adpaco-aws to look at?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I created #1344 for that.

Copy link
Contributor

@tedinski tedinski left a comment

Choose a reason for hiding this comment

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

DSN had a minor suggestion I think, then lgtm.

(vec![], Vec::new())
};

fn new(sess: &'a Session, output: &Path) -> Self {
Copy link
Contributor

Choose a reason for hiding this comment

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

Idle comment: I copied this file (with minor changes) from cranelift. After I did so, I heard that it got updated/simplified.

It's been on my todo list to look into whether I should re-copy it.

I notice that rust-lang/rust#97485 exists though, and that might ultimately let us just delete this file. I'll track that instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That would be great!

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.

Update rust toolchain version for Kani 0.6
3 participants