Skip to content

Commit

Permalink
Update dependencies (rustc nightly-2023-03-01, viper v-2023-02-26-201…
Browse files Browse the repository at this point in the history 
…9) (#1343)

* Update dependencies (rustc nightly-2023-03-01, viper v-2023-02-26-2019)

* Update to new rustc

* `cargo update`

* Include `constructor` info for `BigInt`

* Manually update some deps

* Change expected stdout

* Update viper-toolchain
  • Loading branch information
@viper-admin
viper-admin authored Mar 16, 2023
1 parent d7f5929 commit 9b2ec05
Show file tree
Hide file tree
Showing 27 changed files with 768 additions and 507 deletions.
643 changes: 355 additions & 288 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions analysis/src/mir_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub fn expand_one_level<'tcx>(
guide_place: Place<'tcx>,
) -> (Place<'tcx>, Vec<Place<'tcx>>) {
let index = current_place.projection.len();
let new_projection = tcx.mk_place_elems(
let new_projection = tcx.mk_place_elems_from_iter(
current_place
.projection
.iter()
Expand Down Expand Up @@ -328,7 +328,7 @@ pub fn get_blocked_place<'tcx>(tcx: TyCtxt<'tcx>, borrowed: Place<'tcx>) -> Plac
| mir::ProjectionElem::Subslice { .. } => {
return (mir::Place {
local: place_ref.local,
projection: tcx.intern_place_elems(place_ref.projection),
projection: tcx.mk_place_elems(place_ref.projection),
})
.into();
}
Expand Down
130 changes: 84 additions & 46 deletions analysis/tests/test_cases/definitely_accessible/fields.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,30 +589,51 @@ Result for function main():
"_11"
]
},
"terminator: replace((_1.0: std::boxed::Box<u32>) <- move _11) -> [return: bb6, unwind: bb11]",
"terminator: drop((_1.0: std::boxed::Box<u32>)) -> [return: bb6, unwind: bb7]",
{
"bb11": [
"state:",
{
"accessible": [],
"owned": []
}
],
"bb6": [
"state:",
{
"accessible": [
"_1"
"(_1.1: std::boxed::Box<u32>)",
"(_1.2: std::boxed::Box<u32>)",
"_11"
],
"owned": [
"_1"
"(_1.1: std::boxed::Box<u32>)",
"(_1.2: std::boxed::Box<u32>)",
"_11"
]
}
],
"bb7": [
"state:",
{
"accessible": [],
"owned": []
}
]
}
],
"bb6": [
[],
[
[
"state:",
{
"accessible": [
"(_1.1: std::boxed::Box<u32>)",
"(_1.2: std::boxed::Box<u32>)",
"_11"
],
"owned": [
"(_1.1: std::boxed::Box<u32>)",
"(_1.2: std::boxed::Box<u32>)",
"_11"
]
},
"statement: (_1.0: std::boxed::Box<u32>) = move _11"
]
],
"state before terminator:",
{
"accessible": [
Expand All @@ -622,7 +643,7 @@ Result for function main():
"_1"
]
},
"terminator: drop(_11) -> [return: bb7, unwind: bb13]",
"terminator: drop(_11) -> [return: bb8, unwind: bb13]",
{
"bb13": [
"state:",
Expand All @@ -631,7 +652,7 @@ Result for function main():
"owned": []
}
],
"bb7": [
"bb8": [
"state:",
{
"accessible": [
Expand All @@ -645,6 +666,41 @@ Result for function main():
}
],
"bb7": [
[
[
"state:",
{
"accessible": [],
"owned": []
},
"statement: (_1.0: std::boxed::Box<u32>) = move _11"
]
],
"state before terminator:",
{
"accessible": [
"(_1.0: std::boxed::Box<u32>)"
],
"owned": [
"(_1.0: std::boxed::Box<u32>)"
]
},
"terminator: drop(_11) -> bb13",
{
"bb13": [
"state:",
{
"accessible": [
"(_1.0: std::boxed::Box<u32>)"
],
"owned": [
"(_1.0: std::boxed::Box<u32>)"
]
}
]
}
],
"bb8": [
[
[
"state:",
Expand Down Expand Up @@ -704,16 +760,16 @@ Result for function main():
"_13"
]
},
"terminator: _12 = std::mem::drop::<T>(move _13) -> [return: bb8, unwind: bb10]",
"terminator: _12 = std::mem::drop::<T>(move _13) -> [return: bb9, unwind: bb11]",
{
"bb10": [
"bb11": [
"state:",
{
"accessible": [],
"owned": []
}
],
"bb8": [
"bb9": [
"state:",
{
"accessible": [
Expand All @@ -726,7 +782,7 @@ Result for function main():
]
}
],
"bb8": [
"bb9": [
[
[
"state:",
Expand Down Expand Up @@ -806,16 +862,9 @@ Result for function main():
"_0"
]
},
"terminator: drop(_1) -> [return: bb9, unwind: bb14]",
"terminator: drop(_1) -> [return: bb10, unwind: bb14]",
{
"bb14": [
"state:",
{
"accessible": [],
"owned": []
}
],
"bb9": [
"bb10": [
"state:",
{
"accessible": [
Expand All @@ -825,10 +874,17 @@ Result for function main():
"_0"
]
}
],
"bb14": [
"state:",
{
"accessible": [],
"owned": []
}
]
}
],
"bb9": [
"bb10": [
[
[
"state:",
Expand All @@ -855,32 +911,14 @@ Result for function main():
"terminator: return",
{}
],
"bb10": [
[],
"state before terminator:",
{
"accessible": [],
"owned": []
},
"terminator: drop(_13) -> bb13",
{
"bb13": [
"state:",
{
"accessible": [],
"owned": []
}
]
}
],
"bb11": [
[],
"state before terminator:",
{
"accessible": [],
"owned": []
},
"terminator: drop(_11) -> bb13",
"terminator: drop(_13) -> bb13",
{
"bb13": [
"state:",
Expand Down
86 changes: 58 additions & 28 deletions analysis/tests/test_cases/definitely_accessible/infinite_list.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,20 @@ Result for function test2():
"_2"
]
},
"terminator: replace(_1 <- move _2) -> [return: bb1, unwind: bb4]",
"terminator: drop(_1) -> [return: bb1, unwind: bb2]",
{
"bb1": [
"state:",
{
"accessible": [
"_1"
"_2"
],
"owned": [
"_1"
"_2"
]
}
],
"bb4": [
"bb2": [
"state:",
{
"accessible": [],
Expand All @@ -251,7 +251,20 @@ Result for function test2():
}
],
"bb1": [
[],
[
[
"state:",
{
"accessible": [
"_2"
],
"owned": [
"_2"
]
},
"statement: _1 = move _2"
]
],
"state before terminator:",
{
"accessible": [
Expand All @@ -261,9 +274,9 @@ Result for function test2():
"_1"
]
},
"terminator: drop(_2) -> [return: bb2, unwind: bb5]",
"terminator: drop(_2) -> [return: bb3, unwind: bb5]",
{
"bb2": [
"bb3": [
"state:",
{
"accessible": [
Expand All @@ -284,6 +297,41 @@ Result for function test2():
}
],
"bb2": [
[
[
"state:",
{
"accessible": [],
"owned": []
},
"statement: _1 = move _2"
]
],
"state before terminator:",
{
"accessible": [
"_1"
],
"owned": [
"_1"
]
},
"terminator: drop(_2) -> bb5",
{
"bb5": [
"state:",
{
"accessible": [
"_1"
],
"owned": [
"_1"
]
}
]
}
],
"bb3": [
[
[
"state:",
Expand Down Expand Up @@ -321,9 +369,9 @@ Result for function test2():
"_1"
]
},
"terminator: drop(_1) -> [return: bb3, unwind: bb6]",
"terminator: drop(_1) -> [return: bb4, unwind: bb6]",
{
"bb3": [
"bb4": [
"state:",
{
"accessible": [
Expand All @@ -343,7 +391,7 @@ Result for function test2():
]
}
],
"bb3": [
"bb4": [
[],
"state before terminator:",
{
Expand All @@ -357,24 +405,6 @@ Result for function test2():
"terminator: return",
{}
],
"bb4": [
[],
"state before terminator:",
{
"accessible": [],
"owned": []
},
"terminator: drop(_2) -> bb5",
{
"bb5": [
"state:",
{
"accessible": [],
"owned": []
}
]
}
],
"bb5": [
[],
"state before terminator:",
Expand Down
Loading

0 comments on commit 9b2ec05

Please sign in to comment.