diff options
| author | bors <bors@rust-lang.org> | 2019-07-10 05:21:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-10 05:21:43 +0000 |
| commit | 0324a2b309cd66cb7bd4a156bd0b84cb136e254f (patch) | |
| tree | f85538e316a67aca8f749f5ebd1bb93754e6f206 /src/test/codegen | |
| parent | 3f435f622e0c05a199eb89b71a11181133fdb74c (diff) | |
| parent | 6c0a406b1c9e4c518586ac3cc2fe96c21840a5dc (diff) | |
| download | rust-0324a2b309cd66cb7bd4a156bd0b84cb136e254f.tar.gz rust-0324a2b309cd66cb7bd4a156bd0b84cb136e254f.zip | |
Auto merge of #62555 - Centril:rollup-ti46adx, r=Centril
Rollup of 5 pull requests Successful merges: - #61853 (Emit warning when trying to use PGO in conjunction with unwinding on …) - #62278 (Add Iterator::partition_in_place() and is_partitioned()) - #62283 (Target::arch can take more than listed options) - #62393 (Fix pretty-printing of `$crate` (take 4)) - #62474 (Prepare for LLVM 9 update) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/mainsubprogram.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/mainsubprogramstart.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/mainsubprogram.rs b/src/test/codegen/mainsubprogram.rs index 7f1b0e17f87..790db33437b 100644 --- a/src/test/codegen/mainsubprogram.rs +++ b/src/test/codegen/mainsubprogram.rs @@ -7,7 +7,7 @@ // compile-flags: -g -C no-prepopulate-passes // CHECK-LABEL: @main -// CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DIFlagMainSubprogram{{.*}} +// CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DI{{(SP)?}}FlagMainSubprogram{{.*}} pub fn main() { } diff --git a/src/test/codegen/mainsubprogramstart.rs b/src/test/codegen/mainsubprogramstart.rs index b03290af0e3..d4de9f59ac2 100644 --- a/src/test/codegen/mainsubprogramstart.rs +++ b/src/test/codegen/mainsubprogramstart.rs @@ -6,7 +6,7 @@ #![feature(start)] // CHECK-LABEL: @main -// CHECK: {{.*}}DISubprogram{{.*}}name: "start",{{.*}}DIFlagMainSubprogram{{.*}} +// CHECK: {{.*}}DISubprogram{{.*}}name: "start",{{.*}}DI{{(SP)?}}FlagMainSubprogram{{.*}} #[start] fn start(_: isize, _: *const *const u8) -> isize { |