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.

Sign up for GitHub

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

Jump to bottom

Chore: Ordering of modules now deterministic in compiled code #5684

Merged
merged 4 commits into from
Sep 3, 2024
Merged

Chore: Ordering of modules now deterministic in compiled code #5684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d956ed7
Chore: Ordering of modules now deterministic in compiled code
MikaelMayer Aug 12, 2024
36a179a
Merge branch 'master' into chore-ordering-modules
stefan-aws Aug 13, 2024
a487439
Merge branch 'master' into chore-ordering-modules
MikaelMayer Aug 16, 2024
c3fae65
Merge branch 'master' into chore-ordering-modules
MikaelMayer Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Source/DafnyCore/Backends/Dafny/DafnyCodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,6 +2961,12 @@ protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBod
AddUnsupportedFeature(e.Tok, Feature.ExactBoundedPool);
}

protected override void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
modules = program.CompileModules.ToList();
modules.Sort((a, b) =>
String.Compare(a.FullDafnyName, b.FullDafnyName, StringComparison.Ordinal));
}

protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
TrStmt(body, wr);
}
Expand Down
20 changes: 20 additions & 0 deletions Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/moduleordering.dfy
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

Clever test!

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// NONUNIFORM: Test of the Rust compiler to ensure it emits modules in a deterministic order.
// RUN: %baredafny translate rs "%s" > "%t"
// RUN: %OutputCheck --file-to-check "%S/moduleordering-rust/src/moduleordering.rs" "%s"
// CHECK-L: pub mod A {
// CHECK-L: pub mod B {
// CHECK-L: pub mod C {
// CHECK-L: pub mod D {
// CHECK-L: pub mod E {
// CHECK-L: pub mod F {
// CHECK-L: pub mod G {
// CHECK-L: pub mod H {

module B { const X := "B" }
module D { import B const X := B.X }
module C { import A const X := A.X }
module E { import C const X := C.X }
module A { import G const X := G.X }
module G { const X := "G" }
module F { const X := "F" }
module H { const X := "H" }
Loading