diff options
| author | bors <bors@rust-lang.org> | 2019-01-26 02:10:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-26 02:10:15 +0000 |
| commit | 9df043b543bb9bc3e50bc243811c58d52a3aefea (patch) | |
| tree | cf74ee097b45d0416476ba5726b0feda76de9985 /src/test/codegen | |
| parent | 37d51aa8f3bca674a50eb7c6204deed6fb4dff80 (diff) | |
| parent | 059ed4f21f42914028af5fc0083d3eca13a49d6f (diff) | |
| download | rust-9df043b543bb9bc3e50bc243811c58d52a3aefea.tar.gz rust-9df043b543bb9bc3e50bc243811c58d52a3aefea.zip | |
Auto merge of #57675 - cuviper:llvm-monorepo, r=alexcrichton
Rebase to the llvm-project monorepo
The new git submodule src/llvm-project is a monorepo replacing src/llvm
and src/tools/{clang,lld,lldb}. This also serves as a rebase for these
projects to the new 8.x branch from trunk.
The src/llvm-emscripten fork is unchanged for now.
r? @alexcrichton
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/enum-debug-clike.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/codegen/enum-debug-clike.rs b/src/test/codegen/enum-debug-clike.rs index 98f07505f75..62cfef5a845 100644 --- a/src/test/codegen/enum-debug-clike.rs +++ b/src/test/codegen/enum-debug-clike.rs @@ -8,8 +8,11 @@ // compile-flags: -g -C no-prepopulate-passes +// DIFlagFixedEnum was deprecated in 8.0, renamed to DIFlagEnumClass. +// We match either for compatibility. + // CHECK-LABEL: @main -// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: DIFlagFixedEnum,{{.*}} +// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: {{(DIFlagEnumClass|DIFlagFixedEnum)}},{{.*}} // CHECK: {{.*}}DIEnumerator{{.*}}name: "A",{{.*}}value: {{[0-9].*}} // CHECK: {{.*}}DIEnumerator{{.*}}name: "B",{{.*}}value: {{[0-9].*}} // CHECK: {{.*}}DIEnumerator{{.*}}name: "C",{{.*}}value: {{[0-9].*}} |