diff options
| author | Matthew <mjjasper1@gmail.com> | 2017-04-24 10:20:05 +0100 |
|---|---|---|
| committer | Matthew <mjjasper1@gmail.com> | 2017-04-24 10:20:05 +0100 |
| commit | 158b085f06a41004ebf36d87afa3548f8b60861a (patch) | |
| tree | e035c4787385e562748f7a3d04bb4e5018f82767 /src/test/codegen | |
| parent | 8a3ea01bcae85a3ed0c90ca5603cd88c469172c3 (diff) | |
| parent | 15ce54096a589de277771ad1f55a334fe2661a64 (diff) | |
| download | rust-158b085f06a41004ebf36d87afa3548f8b60861a.tar.gz rust-158b085f06a41004ebf36d87afa3548f8b60861a.zip | |
Fix more merge conflicts
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/drop.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/personality_lifetimes.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/codegen/drop.rs b/src/test/codegen/drop.rs index a4bd5cf2c15..d7e2cb6d9a5 100644 --- a/src/test/codegen/drop.rs +++ b/src/test/codegen/drop.rs @@ -36,7 +36,7 @@ pub fn droppy() { // CHECK-NOT: call{{.*}}drop{{.*}}SomeUniqueName // CHECK: invoke{{.*}}drop{{.*}}SomeUniqueName // CHECK: invoke{{.*}}drop{{.*}}SomeUniqueName -// CHECK: invoke{{.*}}drop{{.*}}SomeUniqueName +// CHECK: call{{.*}}drop{{.*}}SomeUniqueName // CHECK-NOT: {{(call|invoke).*}}drop{{.*}}SomeUniqueName // The next line checks for the } that ends the function definition // CHECK-LABEL: {{^[}]}} diff --git a/src/test/codegen/personality_lifetimes.rs b/src/test/codegen/personality_lifetimes.rs index e0de64b26df..9fd600b32e6 100644 --- a/src/test/codegen/personality_lifetimes.rs +++ b/src/test/codegen/personality_lifetimes.rs @@ -37,5 +37,6 @@ pub fn test() { // CHECK: bitcast{{.*}}personalityslot // CHECK-NEXT: call void @llvm.lifetime.start might_unwind(); + let _t = S; might_unwind(); } |