Skip to content

Feat rust better optimization fix #5771

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

Merged
merged 5 commits into from
Sep 16, 2024
Merged

Feat rust better optimization fix #5771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63b7749
Better soundness fix
MikaelMayer Sep 16, 2024
64da208
Regenerated files
MikaelMayer Sep 16, 2024
447b879
Added test file
MikaelMayer Sep 16, 2024
25a2cb5
Fixed the external classes test
MikaelMayer Sep 16, 2024
b4f65c0
Merge branch 'master' into feat-rust-better-optimization-fix
MikaelMayer Sep 16, 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
29 changes: 8 additions & 21 deletions Source/DafnyCore/Backends/Rust/Dafny-compiler-rust.dfy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,9 +3224,7 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
case _ => enclosingType
};
if (forTrait) {
// Mutability is required when not using raw pointers, even for functione, because
// --release optimisations sometimes removes the code to increment the reference counting on upcasting
var selfFormal := if m.wasFunction && pointerType.Raw? then R.Formal.selfBorrowed else R.Formal.selfBorrowedMut;
var selfFormal := if m.wasFunction then R.Formal.selfBorrowed else R.Formal.selfBorrowedMut;
params := [selfFormal] + params;
} else {
var tpe := GenType(instanceType, GenTypeContext.default());
Expand All @@ -3237,7 +3235,7 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
// For raw pointers, no borrowing is necessary, because it implements the Copy type
} else if selfId == "self" {
if tpe.IsObjectOrPointer() { // For classes and traits
if m.wasFunction && pointerType.Raw? {
if m.wasFunction {
tpe := R.SelfBorrowed;
} else {
tpe := R.SelfBorrowedMut;
Expand Down Expand Up @@ -3960,7 +3958,7 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
case Literal(Null(tpe)) => {
var tpeGen := GenType(tpe, GenTypeContext.default());
if pointerType.Raw? {
r := R.std.MSel("ptr").FSel("null_mut");
r := R.dafny_runtime.MSel("Ptr").AsExpr().FSel("null").Apply([]);
} else {
r := R.TypeAscription(R.dafny_runtime.MSel("Object").AsExpr().Apply1(R.RawExpr("None")), tpeGen);
}
Expand Down Expand Up @@ -5158,12 +5156,10 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
r := R.Identifier("this");
case _ =>
}
if pointerType.Raw? {
r := read_macro.Apply1(r);
} else {
if pointerType.RcMut? {
r := r.Clone();
r := modify_macro.Apply1(r); // Functions have to take &mut because of upcasting
}
r := read_macro.Apply1(r);
}
r := r.Sel(escapeVar(field));
if isConstant {
Expand Down Expand Up @@ -5288,15 +5284,10 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
var onExpr, recOwnership, recIdents;
if base.Trait? || base.Class? {
onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipOwned);
if pointerType.Raw? {
onExpr := read_macro.Apply1(onExpr);
} else {
onExpr := modify_macro.Apply1(onExpr);
}
onExpr := read_macro.Apply1(onExpr);
readIdents := readIdents + recIdents;
} else {
var expectedOnOwnership := if pointerType.Raw? then OwnershipBorrowed else OwnershipBorrowedMut;
onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, expectedOnOwnership);
onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipBorrowed);
readIdents := readIdents + recIdents;
}
r := fullPath.ApplyType(onTypeExprs).FSel(escapeName(name.name)).ApplyType(typeExprs).Apply([onExpr] + argExprs);
Expand All @@ -5316,11 +5307,7 @@ module {:extern "DCOMP"} DafnyToRustCompiler {
case CallName(_, Some(tpe), _, _, _) =>
var typ := GenType(tpe, GenTypeContext.default());
if typ.IsObjectOrPointer() {
if pointerType.Raw? {
onExpr := read_macro.Apply1(onExpr);
} else {
onExpr := modify_macro.Apply1(onExpr);
}
onExpr := read_macro.Apply1(onExpr);
}
case _ =>
}
Expand Down
Loading