Align all scalar numbers to LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR

[Hahnfeld]

Summary

Otherwise, yamlize in YAMLTraits.h might be wrongly defined.
This makes some AMDGPU tests fail when LLVM_LINK_LLVM_DYLIB is set.

[Hahnfeld]

Rebase and adapt test added meanwhile.

[Hahnfeld]

Ping

[Hahnfeld]

Rebase and ping!

[Hahnfeld]

Catch one more occurence.

[Hahnfeld]

Ping! This gets pretty annoying...

[beanz]

LGTM, sorry for the delay!

include/llvm/IR/ModuleSummaryIndexYAML.h

std::vector<FunctionSummary::VFuncId> TypeTestAssumeVCalls,
       TypeCheckedLoadVCalls;
   std::vector<FunctionSummary::ConstVCall> TypeTestAssumeConstVCalls,
       TypeCheckedLoadConstVCalls;
 };
 
 } // End yaml namespace
 } // End llvm namespace
 
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint64_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint64_t)
 
 namespace llvm {
 namespace yaml {
 
 template <> struct MappingTraits<FunctionSummary::VFuncId> {
   static void mapping(IO &io, FunctionSummary::VFuncId& id) {
     io.mapOptional("GUID", id.GUID);
     io.mapOptional("Offset", id.Offset);

include/llvm/ObjectYAML/DWARFYAML.h

struct Data {
   std::vector<LineTable> DebugLines;
 
   bool isEmpty() const;
 };
 
 } // namespace llvm::DWARFYAML
 } // namespace llvm
 
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint8_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint8_t)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex64)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::StringRef)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml::Hex8)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::AttributeAbbrev)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Abbrev)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARangeDescriptor)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::ARange)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::PubEntry)

include/llvm/ObjectYAML/MachOYAML.h

struct UniversalBinary {
   std::vector<Object> Slices;
 };
 
 } // namespace llvm::MachOYAML
 } // namespace llvm
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::LoadCommand)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::Section)
-LLVM_YAML_IS_SEQUENCE_VECTOR(int64_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(int64_t)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::RebaseOpcode)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::BindOpcode)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::ExportEntry)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::NListEntry)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::Object)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::FatArch)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachO::build_tool_version)
 

include/llvm/ObjectYAML/WasmYAML.h

 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::Export)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::ElemSegment)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::Limits)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::DataSegment)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::Global)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::Function)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::LocalDecl)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::WasmYAML::Relocation)
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint32_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
 
 namespace llvm {
 namespace yaml {
 
 template <> struct MappingTraits<WasmYAML::FileHeader> {
   static void mapping(IO &IO, WasmYAML::FileHeader &FileHdr);
 };
 

test/ObjectYAML/MachO/DWARF-debug_line.yaml

- Length:
         TotalLength:     65
       Version:         2
       PrologueLength:  36
       MinInstLength:   1
       DefaultIsStmt:   1
       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
           DirIdx:          0
           ModTime:         0
           Length:          0
       Opcodes:         
         - Opcode:          DW_LNS_extended_op

 #CHECK:         TotalLength:     65
 #CHECK:       Version:         2
 #CHECK:       PrologueLength:  36
 #CHECK:       MinInstLength:   1
 #CHECK:       DefaultIsStmt:   1
 #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
 #CHECK:           DirIdx:          0
 #CHECK:           ModTime:         0
 #CHECK:           Length:          0
 #CHECK:       Opcodes:         
 #CHECK:         - Opcode:          DW_LNS_extended_op

test/ObjectYAML/wasm/elem_section.yaml

 # CHECK: FileHeader:
 # CHECK:   Version:           0x00000001
 # CHECK: Sections:
 # CHECK:   - Type:            ELEM
 # CHECK:     Segments:
 # 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: ...

test/ObjectYAML/wasm/function_section.yaml

 # RUN: yaml2obj %s | obj2yaml | FileCheck %s
 --- !WASM
 FileHeader:
   Version:         0x00000001
 Sections:
   - Type:            FUNCTION
     FunctionTypes:   
       - 1
       - 0
 ...
 # CHECK: --- !WASM
 # CHECK: FileHeader:
 # CHECK:   Version:           0x00000001
 # CHECK: Sections:
 # CHECK:   - Type:            FUNCTION
-# CHECK:     FunctionTypes:   
-# CHECK:       - 1
-# CHECK:       - 0
+# CHECK:     FunctionTypes: [ 1, 0 ]
 # CHECK: ...

test/Transforms/LowerTypeTests/import-unsat.ll

 ; Test that we correctly import an unsat resolution for type identifier "typeid1".
 ; RUN: opt -S -lowertypetests -lowertypetests-summary-action=import -lowertypetests-read-summary=%S/Inputs/import-unsat.yaml -lowertypetests-write-summary=%t < %s | FileCheck %s
 ; RUN: FileCheck --check-prefix=SUMMARY %s < %t
 
 ; SUMMARY:      GlobalValueMap:
 ; SUMMARY-NEXT:   42:
-; SUMMARY-NEXT:     - TypeTests:
-; SUMMARY-NEXT:         - 123
+; SUMMARY-NEXT:     - TypeTests: [ 123 ]
 ; SUMMARY-NEXT: TypeIdMap:
 ; SUMMARY-NEXT:   typeid1:
 ; SUMMARY-NEXT:     TTRes:
 ; SUMMARY-NEXT:       Kind:            Unsat
 ; SUMMARY-NEXT:       SizeM1BitWidth:  0
 
 target datalayout = "e-p:32:32"
 
 declare i1 @llvm.type.test(i8* %ptr, metadata %bitset) nounwind readnone
 
 define i1 @foo(i8* %p) {
   %x = call i1 @llvm.type.test(i8* %p, metadata !"typeid1")
   ; CHECK: ret i1 false
   ret i1 %x
 }

test/Transforms/WholeProgramDevirt/export-unsuccessful-checked.ll

 ; 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
 @vt1b = constant void (i8*)* @vf1b, !type !0
 @vt2a = constant void (i8*)* @vf2a, !type !1
 @vt2b = constant void (i8*)* @vf2b, !type !1
 @vt3a = constant void (i8*)* @vf3a, !type !2
 @vt3b = constant void (i8*)* @vf3b, !type !2

test/Transforms/WholeProgramDevirt/import-indir.ll

 ; SUMMARY-NEXT:        - GUID:            789
 ; SUMMARY-NEXT:          Offset:          8
 ; SUMMARY-NEXT:        - GUID:            1234
 ; SUMMARY-NEXT:          Offset:          16
 ; SUMMARY-NEXT:      TypeTestAssumeConstVCalls:
 ; 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:
 ; SUMMARY-NEXT:       Kind:            Unsat
 ; SUMMARY-NEXT:       SizeM1BitWidth:  0
 ; SUMMARY-NEXT:     WPDRes:
 ; SUMMARY-NEXT:       0:
 ; SUMMARY-NEXT:         Kind:            Indir

unittests/Support/YAMLIOTest.cpp

TEST(YAMLIO, TestFlagsReadError) {
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in uint8_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint8_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint8_t)
 TEST(YAMLIO, TestReadBuiltInTypesUint8Error) {
   std::vector<uint8_t> seq;
   Input yin("---\n"
             "- 255\n"
             "- 0\n"
             "- 257\n"
             "...\n",
             /*Ctxt=*/nullptr,
             suppressErrorMessages);
   yin >> seq;
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in uint16_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint16_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint16_t)
 TEST(YAMLIO, TestReadBuiltInTypesUint16Error) {
   std::vector<uint16_t> seq;
   Input yin("---\n"
             "- 65535\n"
             "- 0\n"
             "- 66000\n"
             "...\n",
             /*Ctxt=*/nullptr,
             suppressErrorMessages);
   yin >> seq;
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in uint32_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint32_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
 TEST(YAMLIO, TestReadBuiltInTypesUint32Error) {
   std::vector<uint32_t> seq;
   Input yin("---\n"
             "- 4000000000\n"
             "- 0\n"
             "- 5000000000\n"
             "...\n",
             /*Ctxt=*/nullptr,
             suppressErrorMessages);
   yin >> seq;
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in uint64_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint64_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint64_t)
 TEST(YAMLIO, TestReadBuiltInTypesUint64Error) {
   std::vector<uint64_t> seq;
   Input yin("---\n"
             "- 18446744073709551615\n"
             "- 0\n"
             "- 19446744073709551615\n"
             "...\n",
             /*Ctxt=*/nullptr,
             suppressErrorMessages);
   yin >> seq;
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in int8_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(int8_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(int8_t)
 TEST(YAMLIO, TestReadBuiltInTypesint8OverError) {
   std::vector<int8_t> seq;
   Input yin("---\n"
             "- -128\n"
             "- 0\n"
             "- 127\n"
             "- 128\n"
            "...\n",
TEST(YAMLIO, TestReadBuiltInTypesint8UnderError) {
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in int16_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(int16_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(int16_t)
 TEST(YAMLIO, TestReadBuiltInTypesint16UnderError) {
   std::vector<int16_t> seq;
   Input yin("---\n"
             "- 32767\n"
             "- 0\n"
             "- -32768\n"
             "- -32769\n"
             "...\n",
TEST(YAMLIO, TestReadBuiltInTypesint16OverError) {
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in int32_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(int32_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(int32_t)
 TEST(YAMLIO, TestReadBuiltInTypesint32UnderError) {
   std::vector<int32_t> seq;
   Input yin("---\n"
             "- 2147483647\n"
             "- 0\n"
             "- -2147483648\n"
             "- -2147483649\n"
             "...\n",
TEST(YAMLIO, TestReadBuiltInTypesint32OverError) {
 
   EXPECT_TRUE(!!yin.error());
 }
 
 
 //
 // Test error handling reading built-in int64_t type
 //
-LLVM_YAML_IS_SEQUENCE_VECTOR(int64_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(int64_t)
 TEST(YAMLIO, TestReadBuiltInTypesint64UnderError) {
   std::vector<int64_t> seq;
   Input yin("---\n"
             "- -9223372036854775808\n"
             "- 0\n"
             "- 9223372036854775807\n"
             "- -9223372036854775809\n"
             "...\n",