[llvm] r305584 - Change YAML traits for vector<string> to flow_vector.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Fri Jun 16 15:50:41 2017
New Revision: 305584

URL: http://llvm.org/viewvc/llvm-project?rev=305584&view=rev
Log:
Change YAML traits for vector<string> to flow_vector.

This is a workaround for an ODR conflict with the definition in
AMDGPUCodeObjectMetadata.cpp.

Modified:
    llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h
    llvm/trunk/test/Transforms/LowerTypeTests/export-icall.ll

Modified: llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h?rev=305584&r1=305583&r2=305584&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h (original)
+++ llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h Fri Jun 16 15:50:41 2017
@@ -188,7 +188,7 @@ template <> struct MappingTraits<Functio
 
 LLVM_YAML_IS_STRING_MAP(TypeIdSummary)
 LLVM_YAML_IS_SEQUENCE_VECTOR(FunctionSummaryYaml)
-LLVM_YAML_IS_SEQUENCE_VECTOR(std::string)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(std::string)
 
 namespace llvm {
 namespace yaml {

Modified: llvm/trunk/test/Transforms/LowerTypeTests/export-icall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LowerTypeTests/export-icall.ll?rev=305584&r1=305583&r2=305584&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LowerTypeTests/export-icall.ll (original)
+++ llvm/trunk/test/Transforms/LowerTypeTests/export-icall.ll Fri Jun 16 15:50:41 2017
@@ -60,11 +60,6 @@ declare !type !8 void @f(i32 %x)
 ; SUMMARY-NEXT:       SizeM1BitWidth:  0
 ; SUMMARY-NEXT:     WPDRes:
 
-; SUMMARY:      CfiFunctionDefs:
-; SUMMARY-NEXT:   - f
-; SUMMARY-NEXT:   - g
-; SUMMARY-NEXT:   - h
-; SUMMARY-NEXT: CfiFunctionDecls:
-; SUMMARY-NEXT:   - external
-; SUMMARY-NEXT:   - external_weak
+; SUMMARY:      CfiFunctionDefs: [ f, g, h ]
+; SUMMARY-NEXT: CfiFunctionDecls: [ external, external_weak ]
 ; SUMMARY-NEXT: ...