diff options
| author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2017-04-04 06:02:32 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2017-04-04 06:02:32 +0000 |
| commit | ba1514c2191f3d74893747dde540403d1b05a754 (patch) | |
| tree | 5a55c00846a28f1df88b151073dc0809b43bf3b1 /test | |
| parent | 099a6fd775f7f4b4171e0af41d5957c654afcde5 (diff) | |
Align all scalar numbers to LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR
Otherwise, yamlize in YAMLTraits.h might be wrongly defined.
This makes some AMDGPU tests fail when LLVM_LINK_LLVM_DYLIB is set.
Differential Revision: https://reviews.llvm.org/D30508
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299415 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/ObjectYAML/MachO/DWARF-debug_line.yaml | 28 | ||||
| -rw-r--r-- | test/ObjectYAML/wasm/elem_section.yaml | 6 | ||||
| -rw-r--r-- | test/ObjectYAML/wasm/function_section.yaml | 4 | ||||
| -rw-r--r-- | test/Transforms/LowerTypeTests/import-unsat.ll | 3 | ||||
| -rw-r--r-- | test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll | 4 | ||||
| -rw-r--r-- | test/Transforms/WholeProgramDevirt/import-indir.ll | 8 |
6 files changed, 9 insertions, 44 deletions
diff --git a/test/ObjectYAML/MachO/DWARF-debug_line.yaml b/test/ObjectYAML/MachO/DWARF-debug_line.yaml index 692b5014428..6d87ea68cdc 100644 --- a/test/ObjectYAML/MachO/DWARF-debug_line.yaml +++ b/test/ObjectYAML/MachO/DWARF-debug_line.yaml @@ -502,19 +502,7 @@ DWARF: LineBase: 251 LineRange: 14 OpcodeBase: 13 - StandardOpcodeLengths: - - 0 - - 1 - - 1 - - 1 - - 1 - - 0 - - 0 - - 0 - - 1 - - 0 - - 0 - - 1 + StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ] IncludeDirs: Files: - Name: hello_world.c @@ -556,19 +544,7 @@ DWARF: #CHECK: LineBase: 251 #CHECK: LineRange: 14 #CHECK: OpcodeBase: 13 -#CHECK: StandardOpcodeLengths: -#CHECK: - 0 -#CHECK: - 1 -#CHECK: - 1 -#CHECK: - 1 -#CHECK: - 1 -#CHECK: - 0 -#CHECK: - 0 -#CHECK: - 0 -#CHECK: - 1 -#CHECK: - 0 -#CHECK: - 0 -#CHECK: - 1 +#CHECK: StandardOpcodeLengths: [ 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1 ] #CHECK: IncludeDirs: #CHECK: Files: #CHECK: - Name: hello_world.c diff --git a/test/ObjectYAML/wasm/elem_section.yaml b/test/ObjectYAML/wasm/elem_section.yaml index 67de7095b5f..498c9aa93ea 100644 --- a/test/ObjectYAML/wasm/elem_section.yaml +++ b/test/ObjectYAML/wasm/elem_section.yaml @@ -32,11 +32,9 @@ Sections: # CHECK: - Offset: # CHECK: Opcode: I32_CONST # CHECK: Value: 3 -# CHECK: Functions: -# CHECK: - 1 +# CHECK: Functions: [ 1 ] # CHECK: - Offset: # CHECK: Opcode: I32_CONST # CHECK: Value: 5 -# CHECK: Functions: -# CHECK: - 4 +# CHECK: Functions: [ 4 ] # CHECK: ... diff --git a/test/ObjectYAML/wasm/function_section.yaml b/test/ObjectYAML/wasm/function_section.yaml index 6aaf9d4b513..39e6b75d5cd 100644 --- a/test/ObjectYAML/wasm/function_section.yaml +++ b/test/ObjectYAML/wasm/function_section.yaml @@ -13,7 +13,5 @@ Sections: # CHECK: Version: 0x00000001 # CHECK: Sections: # CHECK: - Type: FUNCTION -# CHECK: FunctionTypes: -# CHECK: - 1 -# CHECK: - 0 +# CHECK: FunctionTypes: [ 1, 0 ] # CHECK: ... diff --git a/test/Transforms/LowerTypeTests/import-unsat.ll b/test/Transforms/LowerTypeTests/import-unsat.ll index 7410bc4b4d8..76b24400198 100644 --- a/test/Transforms/LowerTypeTests/import-unsat.ll +++ b/test/Transforms/LowerTypeTests/import-unsat.ll @@ -4,8 +4,7 @@ ; SUMMARY: GlobalValueMap: ; SUMMARY-NEXT: 42: -; SUMMARY-NEXT: - TypeTests: -; SUMMARY-NEXT: - 123 +; SUMMARY-NEXT: - TypeTests: [ 123 ] ; SUMMARY-NEXT: TypeIdMap: ; SUMMARY-NEXT: typeid1: ; SUMMARY-NEXT: TTRes: diff --git a/test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll b/test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll index 607c89a6e87..0785ade2857 100644 --- a/test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll +++ b/test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll @@ -1,9 +1,7 @@ ; RUN: opt -wholeprogramdevirt -wholeprogramdevirt-summary-action=export -wholeprogramdevirt-read-summary=%S/Inputs/export.yaml -wholeprogramdevirt-write-summary=%t -o /dev/null %s ; RUN: FileCheck %s < %t -; CHECK: - TypeTests: -; CHECK-NEXT: - 15427464259790519041 -; CHECK-NEXT: - 17525413373118030901 +; CHECK: - TypeTests: [ 15427464259790519041, 17525413373118030901 ] ; CHECK-NEXT: TypeTestAssumeVCalls: @vt1a = constant void (i8*)* @vf1a, !type !0 diff --git a/test/Transforms/WholeProgramDevirt/import-indir.ll b/test/Transforms/WholeProgramDevirt/import-indir.ll index dcd1f7f41f4..1de9352eeb2 100644 --- a/test/Transforms/WholeProgramDevirt/import-indir.ll +++ b/test/Transforms/WholeProgramDevirt/import-indir.ll @@ -19,16 +19,12 @@ ; SUMMARY-NEXT: - VFunc: ; SUMMARY-NEXT: GUID: 123 ; SUMMARY-NEXT: Offset: 4 -; SUMMARY-NEXT: Args: -; SUMMARY-NEXT: - 12 -; SUMMARY-NEXT: - 24 +; SUMMARY-NEXT: Args: [ 12, 24 ] ; SUMMARY-NEXT: TypeCheckedLoadConstVCalls: ; SUMMARY-NEXT: - VFunc: ; SUMMARY-NEXT: GUID: 456 ; SUMMARY-NEXT: Offset: 8 -; SUMMARY-NEXT: Args: -; SUMMARY-NEXT: - 24 -; SUMMARY-NEXT: - 12 +; SUMMARY-NEXT: Args: [ 24, 12 ] ; SUMMARY-NEXT: TypeIdMap: ; SUMMARY-NEXT: typeid1: ; SUMMARY-NEXT: TTRes: |