Imported Upstream version 5.18.0.167

Former-commit-id: 289509151e0fee68a1b591a20c9f109c3c789d3a
2018-10-20 08:25:10 +00:00
parent e19d552987
commit b084638f15
28489 changed files with 184 additions and 3866856 deletions
--- a/external/llvm/test/YAMLParser/construct-merge.test
+++ b/external/llvm/test/YAMLParser/construct-merge.test
@ -1,29 +0,0 @@
-# RUN: yaml-bench -canonical %s
-
---
- &CENTER { x: 1, 'y': 2 }
- &LEFT { x: 0, 'y': 2 }
- &BIG { r: 10 }
- &SMALL { r: 1 }
-
-# All the following maps are equal:
-
- # Explicit keys
-  x: 1
-  'y': 2
-  r: 10
-  label: center/big
-
- # Merge one map
-  << : *CENTER
-  r: 10
-  label: center/big
-
- # Merge multiple maps
-  << : [ *CENTER, *BIG ]
-  label: center/big
-
- # Override
-  << : [ *BIG, *LEFT, *SMALL ]
-  x: 1
-  label: center/big