summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-19 13:01:27 +0000
committerbors <bors@rust-lang.org>2017-06-19 13:01:27 +0000
commit04145943a25c3b8c7e7d7fe8c2efb04f259c25fb (patch)
tree1c3a1dcc8f0cb6181c6bbaa8e7e6d2903be99e83 /src/test/codegen
parent5ce5126199d0edf278ef0d9bb60534770d96f3f6 (diff)
parent11f4968bd7372ed3986ff7d83fb14218ef0f2f20 (diff)
downloadrust-04145943a25c3b8c7e7d7fe8c2efb04f259c25fb.tar.gz
rust-04145943a25c3b8c7e7d7fe8c2efb04f259c25fb.zip
Auto merge of #39409 - pnkfelix:mir-borrowck2, r=nikomatsakis
MIR EndRegion Statements (was MIR dataflow for Borrows)

This PR adds an `EndRegion` statement to MIR (where the `EndRegion` statement is what terminates a borrow).

An earlier version of the PR implemented a dataflow analysis on borrow expressions, but I am now factoring that into a follow-up PR so that reviewing this one is easier. (And also because there are some revisions I want to make to that dataflow code, but I want this PR to get out of WIP status...)

This is a baby step towards MIR borrowck. I just want to get the review process going while I independently work on the remaining steps.
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/drop.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/codegen/drop.rs b/src/test/codegen/drop.rs
index d7e2cb6d9a5..1961060c2c2 100644
--- a/src/test/codegen/drop.rs
+++ b/src/test/codegen/drop.rs
@@ -32,9 +32,9 @@ pub fn droppy() {
 // CHECK-NOT: invoke{{.*}}drop{{.*}}SomeUniqueName
 // CHECK: call{{.*}}drop{{.*}}SomeUniqueName
 // CHECK: call{{.*}}drop{{.*}}SomeUniqueName
-// CHECK: call{{.*}}drop{{.*}}SomeUniqueName
 // CHECK-NOT: call{{.*}}drop{{.*}}SomeUniqueName
 // CHECK: invoke{{.*}}drop{{.*}}SomeUniqueName
+// CHECK: call{{.*}}drop{{.*}}SomeUniqueName
 // CHECK: invoke{{.*}}drop{{.*}}SomeUniqueName
 // CHECK: call{{.*}}drop{{.*}}SomeUniqueName
 // CHECK-NOT: {{(call|invoke).*}}drop{{.*}}SomeUniqueName