Imported Upstream version 5.18.0.247

Former-commit-id: 2d6af2e4ed0eda5cbdc2946446ef7718456ad190
2019-01-25 08:19:26 +00:00
parent 279aa8f685
commit ce8e504569
28478 changed files with 39 additions and 3866962 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